diff options
| author | Martin Renold <martinxyz@gmx.ch> | 2009-07-01 20:18:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:46:30 (GMT) |
| commit | 606475f3178784e5a6b3a01dce1a54314345cf43 (patch) | |
| tree | bd641f06c6fd9d71d54e6909e26560ab21c254d5 /ll-merge.c | |
| parent | 702beb3af0531bae95ab559fff043785614d53f2 (diff) | |
| download | git-606475f3178784e5a6b3a01dce1a54314345cf43.zip git-606475f3178784e5a6b3a01dce1a54314345cf43.tar.gz git-606475f3178784e5a6b3a01dce1a54314345cf43.tar.bz2 | |
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 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); |