diff options
| author | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | 2017-05-22 10:33:52 +0200 |
|---|---|---|
| committer | Mathieu Cartaud <mathieu.cartaud@obeo.fr> | 2017-06-27 10:33:50 +0200 |
| commit | f7e233e4500e257a8d1f09d69c0966be266b6f1e (patch) | |
| tree | df39c00bcf62cca7eb07e69705761c8e11f3bd8e /org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit | |
| parent | 43672700e747c3f95b64871b125129c152b9fa20 (diff) | |
| download | jgit-f7e233e4500e257a8d1f09d69c0966be266b6f1e.tar.gz jgit-f7e233e4500e257a8d1f09d69c0966be266b6f1e.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif | bin | 0 -> 106 bytes |
| -rw-r--r-- | org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif | bin | 0 -> 874 bytes |
2 files changed, 0 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000000..47b9e321da --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/disabled_checked.gif 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 Binary files differnew file mode 100644 index 0000000000..252f76221a --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/attributes/merge/enabled_checked.gif |
