summaryrefslogtreecommitdiffstats
path: root/resolve-undo.c
AgeCommit message (Expand)AuthorLines
2010-07-05Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen-19/+15
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips-1/+1
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips-2/+2
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips-1/+1
2010-02-01build: make code "-Wpointer-arith" cleanJunio C Hamano-2/+2
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano-0/+59
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano-0/+117