diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 17:18:45 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 17:18:45 (GMT) |
commit | 23fc55a90c0956908cb595789b460179c062153b (patch) | |
tree | 7c5787569ea6c158048f0e28195b5dc1c44784b6 /diff-lib.c | |
parent | f72432d64ebc4fea80265114464ddb7b25ce9633 (diff) | |
parent | 28cb06020bc86eea46288c29673ac108c3944089 (diff) | |
download | git-23fc55a90c0956908cb595789b460179c062153b.zip git-23fc55a90c0956908cb595789b460179c062153b.tar.gz git-23fc55a90c0956908cb595789b460179c062153b.tar.bz2 |
Merge branch 'mw/doc-merge-enumfix'
Fix old merge glitch in Documentation during v2.13-rc0 era.
* mw/doc-merge-enumfix:
doc: update the order of the syntax `git merge --continue`
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions