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)
* mm/merge-in-dirty-worktree-doc:
  Documentation/git-merge.txt: weaken warning about uncommited changes

1  2 
Documentation/git-merge.txt

Simple merge