diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-26 16:20:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 16:20:56 -0700 |
| commit | 3a3357e80cfe1646ce4fc7d834b7cb4ee3e65283 (patch) | |
| tree | 865a40a2fea0668bf46fd5da7869f79786b9dea4 /git-merge.txt | |
| parent | 8ab949466f2182c01fb1955cca8b1bba8d2b431a (diff) | |
| download | git-htmldocs-3a3357e80cfe1646ce4fc7d834b7cb4ee3e65283.tar.gz | |
Autogenerated HTML docs for v1.8.3.1-605-g85318
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.txt b/git-merge.txt index 67ca99cd9..8c7f2f66d 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -56,8 +56,8 @@ especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore: -*Warning*: Running 'git merge' with uncommitted changes is -discouraged: while possible, it leaves you in a state that is hard to +*Warning*: Running 'git merge' with non-trivial uncommitted changes is +discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict. |