aboutsummaryrefslogtreecommitdiff
path: root/resolve-undo.c
Commit message (Expand)AuthorAge
* string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-27
* string_list: Fix argument order for string_list_insertJulian Phillips2010-06-27
* string_list: Fix argument order for for_each_string_listJulian Phillips2010-06-27
* build: make code "-Wpointer-arith" cleanJunio C Hamano2010-02-01
* resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano2009-12-25
* resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano2009-12-25