From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Jun 2013 22:07:43 +0000 (-0700)
Subject: Merge branch 'mm/merge-in-dirty-worktree-doc'
X-Git-Tag: v1.8.4-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a17e9ad15f77b739a33da703f695ad924cd825a?ds=inline;hp=-c

Merge branch 'mm/merge-in-dirty-worktree-doc'

* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
---

9a17e9ad15f77b739a33da703f695ad924cd825a
diff --combined Documentation/git-merge.txt
index 67ca99cd92,20a9912d05..8c7f2f66d8
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -56,8 -56,8 +56,8 @@@ especially if those changes were furthe
  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.
  
  
@@@ -76,7 -76,8 +76,7 @@@ The 'git fmt-merge-msg' command can b
  used to give a good default for automated 'git merge'
  invocations.
  
 ---rerere-autoupdate::
 ---no-rerere-autoupdate::
 +--[no-]rerere-autoupdate::
  	Allow the rerere mechanism to update the index with the
  	result of auto-conflict resolution if possible.
  
@@@ -201,10 -202,10 +201,10 @@@ of the merge.  Among the changes made t
  non-overlapping ones (that is, you changed an area of the file while the
  other side left that area intact, or vice versa) are incorporated in the
  final result verbatim.  When both sides made changes to the same area,
 -however, git cannot randomly pick one side over the other, and asks you to
 +however, Git cannot randomly pick one side over the other, and asks you to
  resolve it by leaving what both sides did to that area.
  
 -By default, git uses the same style as the one used by the "merge" program
 +By default, Git uses the same style as the one used by the "merge" program
  from the RCS suite to present such a conflicted hunk, like this:
  
  ------------