]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 702beb3) | patch
Remove filename from conflict markers
authorMartin Renold <martinxyz@gmx.ch>
Wed, 1 Jul 2009 20:18:04 +0000 (22:18 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Jul 2009 02:46:30 +0000 (19:46 -0700)
commit606475f3178784e5a6b3a01dce1a54314345cf43
treebd641f06c6fd9d71d54e6909e26560ab21c254d5tree | snapshot
parent702beb3af0531bae95ab559fff043785614d53f2commit | diff
Remove filename from conflict markers

Put filenames into the conflict markers only when they are different.
Otherwise they are redundant information clutter.

Print the filename explicitely when warning about a binary conflict.

Signed-off-by: Martin Renold <martinxyz@gmx.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
ll-merge.c diff | blob | blame | history
merge-recursive.c diff | blob | blame | history
t/t3404-rebase-interactive.sh diff | blob | blame | history
t/t6024-recursive-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.