merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / resolve-undo.h
2009-12-26 resolve-undo: record resolved conflicts in a new index...