From: Junio C Hamano Date: Mon, 22 Jul 2013 05:51:32 +0000 (-0700) Subject: Merge branch 'mm/merge-in-dirty-worktree-doc' into maint X-Git-Tag: v1.8.3.4~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279?hp=80f074396d2a5601cdbf643f9b0db09329070a3f 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 --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 67ca99cd92..8c7f2f66d8 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.