diff options
| author | Martin Renold <martinxyz@gmx.ch> | 2009-07-01 22:18:04 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:46:30 -0700 |
| commit | 606475f3178784e5a6b3a01dce1a54314345cf43 (patch) | |
| tree | bd641f06c6fd9d71d54e6909e26560ab21c254d5 /combine-diff.c | |
| parent | 702beb3af0531bae95ab559fff043785614d53f2 (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>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions