Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve-undo: "checkout -m path" uses resolve-undo information | Junio C Hamano | 2009-12-25 | 1 | -0/+2 |
* | resolve-undo: record resolved conflicts in a new index extension section | Junio C Hamano | 2009-12-25 | 1 | -0/+14 |