merge-tree: use ll_merge() not xdl_merge()
[gitweb.git] / resolve-undo.c
2009-12-26 resolve-undo: "checkout -m path" uses resolve-undo...
2009-12-26 resolve-undo: record resolved conflicts in a new index...