summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 05:51:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 05:51:32 (GMT)
commit4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279 (patch)
tree39b53f3b447c22a63640ac01281937cba5f14f5a /Documentation/git-merge.txt
parent80f074396d2a5601cdbf643f9b0db09329070a3f (diff)
parent76b80cdf17807ba4a773562df2218980ffa27e4f (diff)
downloadgit-4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279.zip
git-4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279.tar.gz
git-4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279.tar.bz2
Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 67ca99c..8c7f2f6 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/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.