summaryrefslogtreecommitdiff
path: root/resolve-undo.c
Commit message (Expand)AuthorAgeFilesLines
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-251-0/+59
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-251-0/+117