diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:45 -0700 |
| commit | 23fc55a90c0956908cb595789b460179c062153b (patch) | |
| tree | 7c5787569ea6c158048f0e28195b5dc1c44784b6 /builtin/cat-file.c | |
| parent | Merge branch 'en/rename-directory-detection' (diff) | |
| parent | doc: update the order of the syntax `git merge --continue` (diff) | |
| download | tgif-23fc55a90c0956908cb595789b460179c062153b.tar.xz | |
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 'builtin/cat-file.c')
0 files changed, 0 insertions, 0 deletions