diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:19 -0700 |
| commit | 9f43095e4638ec070b361762a43001563177394f (patch) | |
| tree | e8e65687716dee3607541a40ee0363dda72d1d33 /xdiff/xmerge.c | |
| parent | Merge branch 'sb/wt-status-cleanup' (diff) | |
| parent | doc: change erroneous --[no]-whatever into --[no-]whatever (diff) | |
| download | tgif-9f43095e4638ec070b361762a43001563177394f.tar.xz | |
Merge branch 'ab/doc-no-option-notation-fix'
Doc fix.
* ab/doc-no-option-notation-fix:
doc: change erroneous --[no]-whatever into --[no-]whatever
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions