merge & sequencer: turn "Conflicts:" hint into a comment
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Oct 2014 20:04:38 +0000 (13:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Oct 2014 21:04:28 +0000 (14:04 -0700)
commit261f315...ebfa9af2d09f20211960100ff06f87cb
tree398928f...0a310b7e06d33025a5126e6403fad74acopy hash to clipboard (tree)
parent073bd75...177aa9f1fc42b152a38e251c7156dfe0copy hash to clipboard (diff)
builtin/commit.c
sequencer.c
t/t3507-cherry-pick-conflict.sh