rerere: use ll_merge() instead of using xdl_merge()
[gitweb.git] / resolve-undo.h
2009-12-26 resolve-undo: "checkout -m path" uses resolve-undo...
2009-12-26 resolve-undo: record resolved conflicts in a new index...