merge & sequencer: unify codepaths that write "Conflicts:" hint
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:34:59 +0000 (11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 18:34:59 +0000 (11:34 -0700)
commit75c961b...67ec061696634c1079dbe5f1a9e10f93
tree427dd88...2ab47c3f4ad827022bf73a8d9b6d4271copy hash to clipboard (tree)
parent08e3ce5...20d738746b2a7700be6d3954bf01a2b9copy hash to clipboard (diff)
builtin/merge.c
sequencer.c
sequencer.h