mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove filename from conflict markers

Browse Source 
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>
This commit is contained in:
Martin Renold
2009-07-01 22:18:04 +02:00
committed by Junio C Hamano
parent 702beb3af0
commit 606475f317
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ll-merge.c
View File

@ -55,7 +55,7 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
mmbuffer_t *result,
const char *path_unused,
const char *path,
mmfile_t *orig,
mmfile_t *src1, const char *name1,
mmfile_t *src2, const char *name2,
@ -67,10 +67,10 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
if (buffer_is_binary(orig->ptr, orig->size) ||
buffer_is_binary(src1->ptr, src1->size) ||
buffer_is_binary(src2->ptr, src2->size)) {
warning("Cannot merge binary files: %s vs. %s\n",
name1, name2);
warning("Cannot merge binary files: %s (%s vs. %s)\n",
path, name1, name2);
return ll_binary_merge(drv_unused, result,
path_unused,
path,
orig, src1, name1,
src2, name2,
virtual_ancestor);