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 /Documentation/git-merge.txt | |
| parent | f72432d64ebc4fea80265114464ddb7b25ce9633 (diff) | |
| parent | 28cb06020bc86eea46288c29673ac108c3944089 (diff) | |
| download | git-23fc55a90c0956908cb595789b460179c062153b.tar.gz | |
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 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d5dfd8430f..6a5c00e2c2 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore: discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict. -The fourth syntax ("`git merge --continue`") can only be run after the +The third syntax ("`git merge --continue`") can only be run after the merge has resulted in conflicts. OPTIONS |