xdl_merge(): allow passing down marker_size in xmparam_t
[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...