summaryrefslogtreecommitdiff
path: root/resolve-undo.h
AgeCommit message (Expand)AuthorFilesLines
2010-02-01build: make code "-Wpointer-arith" cleanLibravatar Junio C Hamano1-1/+1
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+2
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+14