summaryrefslogtreecommitdiff
path: root/resolve-undo.c
AgeCommit message (Expand)AuthorFilesLines
2010-07-05Convert the users of for_each_string_list to for_each_string_list_item macroLibravatar Alex Riesen1-19/+15
2010-06-27string_list: Fix argument order for string_list_lookupLibravatar Julian Phillips1-1/+1
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-2/+2
2010-06-27string_list: Fix argument order for for_each_string_listLibravatar Julian Phillips1-1/+1
2010-02-01build: make code "-Wpointer-arith" cleanLibravatar Junio C Hamano1-2/+2
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+59
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+117