diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-25 14:34:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 14:34:23 +0900 |
| commit | c25d98b2a730cbc63033ba3360df2519d43a40cd (patch) | |
| tree | 28a8cc8b488949c0ca6a3563fadc94382758a94b /t | |
| parent | Git 2.10.4 (diff) | |
| download | tgif-c25d98b2a730cbc63033ba3360df2519d43a40cd.tar.xz | |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions