workdir.c
16 KB
-
merge: comment conflicts lines in MERGE_MSG · c0297d47git has started adding comment markers to its conflict lines in MERGE_MSG. Match that behavior.
Edward Thomson committed
git has started adding comment markers to its conflict lines in MERGE_MSG. Match that behavior.