From f7e233e4500e257a8d1f09d69c0966be266b6f1e Mon Sep 17 00:00:00 2001
From: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Date: Mon, 22 May 2017 10:33:52 +0200
Subject: Support -merge attribute in binary macro

The merger is now able to react to the use of the merge attribute.
The value unset and the custom value 'binary' are handled (-merge
and merge=binary)

Since the specification of the merge attribute states that when the
attribute is unset, ours version must be kept in case of a conflict, we
don't overwrite the file but keep the local version.

Bug: 517128
Change-Id: Ib5fbf17bdaf727bc5d0e106ce88f2620d9f87a6f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
---
 .../eclipse/jgit/attributes/merge/disabled_checked.gif    | Bin 0 -> 106 bytes
 .../org/eclipse/jgit/attributes/merge/enabled_checked.gif | Bin 0 -> 874 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif
 create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif

(limited to 'org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit')

diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif
new file mode 100644
index 0000000000..47b9e321da
Binary files /dev/null and b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif differ
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif
new file mode 100644
index 0000000000..252f76221a
Binary files /dev/null and b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif differ
-- 
cgit v1.2.3