merge-strategies: avoid implying that "-s theirs" exists
The description of `-Xours` merge option has a parenthetical note that tells the readers that it is very different from `-s ours`, which is correct, but the description of `-Xtheirs` that follows it carelessly says "this is the opposite of `ours`", giving a false impression that the readers also need to be warned that it is very different from `-s theirs`, which in reality does not even exist. Clarify it a bit to avoid misleading readers. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 25, 2017 at 14:34 UTC
c25d98b2a730cbc63033ba3360df2519d43a40cd
1 file changed
+2
-1
Documentation/merge-strategies.txt
+2
-1
@@ -39,7 +39,8 @@ even look at what the other tree contains at all. It discards everything
39
the other tree did, declaring 'our' history contains all that happened in it.
40
41
theirs;;
42
- This is the opposite of 'ours'.
42
+ This is the opposite of 'ours'; note that, unlike 'ours', there is
43
+ no 'theirs' merge stragegy to confuse this merge option with.
44
45
patience;;
46
With this option, 'merge-recursive' spends a little extra time