diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
| commit | 14e6683c9ffe288fd03fe38170e3d255056a7841 (patch) | |
| tree | a3248ef8aa66bb4132fd6442a25d39a151b8173b /git-merge.txt | |
| parent | 49bcf742a2710071f132cc7efcad8c4f4d7f0984 (diff) | |
| download | git-htmldocs-14e6683c9ffe288fd03fe38170e3d255056a7841.tar.gz | |
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index d5dfd8430..6a5c00e2c 100644 --- a/git-merge.txt +++ b/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 |