diff options
Diffstat (limited to 'Documentation/merge-strategies.txt')
| -rw-r--r-- | Documentation/merge-strategies.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 0307449..fd5d748 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -39,7 +39,8 @@ 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 the opposite of 'ours'. + This is the opposite of 'ours'; note that, unlike 'ours', there is + no 'theirs' merge stragegy to confuse this merge option with. patience;; With this option, 'merge-recursive' spends a little extra time |