diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:03 +0900 |
| commit | 77cdf8c6f9d142a8d9693531d442ffa0712874d6 (patch) | |
| tree | 33fb9d829abc6a46aa02ab25778573cef23d2e4c /config.mak.uname | |
| parent | Merge branch 'rs/mailinfo-qp-decode-fix' into maint (diff) | |
| parent | merge-strategies: avoid implying that "-s theirs" exists (diff) | |
| download | tgif-77cdf8c6f9d142a8d9693531d442ffa0712874d6.tar.xz | |
Merge branch 'jc/merge-x-theirs-docfix' into maint
The documentation for '-X<option>' for merges was misleadingly
written to suggest that "-s theirs" exists, which is not the case.
* jc/merge-x-theirs-docfix:
merge-strategies: avoid implying that "-s theirs" exists
Diffstat (limited to 'config.mak.uname')
0 files changed, 0 insertions, 0 deletions