| commit | 23fc55a90c0956908cb595789b460179c062153b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jun 2018 17:18:45 +0000 (18 10:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Jun 2018 17:18:45 +0000 (18 10:18 -0700) | ||
| tree | 7c5787569ea6c158048f0e28195b5dc1c44784b6 | treesnapshot (tar.gz zip) |
| parent | f72432d64ebc4fea80265114464ddb7b25ce9633 | commitdiff |
| parent | 28cb06020bc86eea46288c29673ac108c3944089 | commitdiff |
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`
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`
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |