Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:32 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:51:32 +0000 (22:51 -0700)
commit4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279
tree39b53f3b447c22a63640ac01281937cba5f14f5a
parent80f074396d2a5601cdbf643f9b0db09329070a3f
parent76b80cdf17807ba4a773562df2218980ffa27e4f
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
Documentation/git-merge.txt