Skip to content

Commit c25d98b

Browse files
committed
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 <[email protected]>
1 parent 0bfff81 commit c25d98b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/merge-strategies.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ even look at what the other tree contains at all. It discards everything
3939
the other tree did, declaring 'our' history contains all that happened in it.
4040

4141
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.
4344

4445
patience;;
4546
With this option, 'merge-recursive' spends a little extra time

0 commit comments

Comments
 (0)