summaryrefslogtreecommitdiff
path: root/resolve-undo.h
AgeCommit message (Expand)Author
2010-02-02build: make code "-Wpointer-arith" cleanJunio C Hamano
2009-12-26resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano
2009-12-26resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano