Merge branch 'cc/interpret-trailers-more'
commit0ed8a4e161c06b82734f5f5268a5b1fb68abb954
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:26:23 +0000 (22 12:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:26:24 +0000 (22 12:26 -0800)
tree3adfc815939e2ce7688b69d3463cdb9b19dca5ab
parent3f1509809e728b70ea7912e4e1b40f22965e45ee
parent3d24a7267dd9b57b864d119a533bdfdfaccd9161
Merge branch 'cc/interpret-trailers-more'

"git interpret-trailers" learned to properly handle the
"Conflicts:" block at the end.

* cc/interpret-trailers-more:
  trailer: add test with an old style conflict block
  trailer: reuse ignore_non_trailer() to ignore conflict lines
  commit: make ignore_non_trailer() non static
  merge & sequencer: turn "Conflicts:" hint into a comment
  builtin/commit.c: extract ignore_non_trailer() helper function
  merge & sequencer: unify codepaths that write "Conflicts:" hint
  builtin/merge.c: drop a parameter that is never used
builtin/commit.c
builtin/merge.c
commit.c
commit.h
sequencer.c
trailer.c