diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-12 02:01:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 02:01:52 -0700 |
| commit | e0e2065f74500119d5e12524992273de362acd30 (patch) | |
| tree | 4e28a9a1facca926c5fbbf3027417f0cf0a71aaa /Documentation/RelNotes | |
| parent | attr: "binary" attribute should choose built-in "binary" merge driver (diff) | |
| download | tgif-e0e2065f74500119d5e12524992273de362acd30.tar.xz | |
ll-merge: warn about inability to merge binary files only when we can't
When a path being merged is auto detected to be a binary file, we
warned "Cannot merge binary files" before switching to activate the
binary ll-merge driver. When we are merging with the -Xours/theirs
option, however, we know what the "clean" merge result is, and the
warning is inappropriate.
In addition, when the path is explicitly marked as a binary file,
this warning was not issued, even though without -Xours/theirs, we
cannot cleanly automerge such a path, which was inconsistent.
Move the warning code from ll_xdl_merge() to ll_binary_merge(), and
issue the message only when we cannot cleanly automerge.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
0 files changed, 0 insertions, 0 deletions