summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-09 04:27:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-09 04:27:19 (GMT)
commita944af1d86e6171d68ed2a3aa67b1d68f00e1fe8 (patch)
tree7f351a1a1d9d7f01cc7195a527eab88417789417 /Documentation/merge-strategies.txt
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8.zip
git-a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8.tar.gz
git-a944af1d86e6171d68ed2a3aa67b1d68f00e1fe8.tar.bz2
merge: teach -Xours/-Xtheirs to binary ll-merge driver
The (discouraged) -Xours/-Xtheirs modes of merge are supposed to give a quick and dirty way to come up with a random mixture of cleanly merged parts and punted conflict resolution to take contents from one side in conflicting parts. These options however were only passed down to the low level merge driver for text. Teach the built-in binary merge driver to notice them as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 595a3cf..66db802 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -32,13 +32,14 @@ ours;;
This option forces conflicting hunks to be auto-resolved cleanly by
favoring 'our' version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
+
This should not be confused with the 'ours' merge strategy, which does not
even look at what the other tree contains at all. It discards everything
the other tree did, declaring 'our' history contains all that happened in it.
theirs;;
- This is opposite of 'ours'.
+ This is the opposite of 'ours'.
patience;;
With this option, 'merge-recursive' spends a little extra time