![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin Renold <martinxyz@gmx.ch> | |
| Wed, 1 Jul 2009 20:18:04 +0000 (22:18 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Jul 2009 02:46:30 +0000 (19:46 -0700) | ||
| commit | 606475f3178784e5a6b3a01dce1a54314345cf43 | |
| tree | bd641f06c6fd9d71d54e6909e26560ab21c254d5 | tree | snapshot |
| parent | 702beb3af0531bae95ab559fff043785614d53f2 | commit | 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>
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 | history | |
| merge-recursive.c | diff | blob | history | |
| t/t3404-rebase-interactive.sh | diff | blob | history | |
| t/t6024-recursive-merge.sh | diff | blob | history |