Andrew's git / gitweb.git / diff
?
Merge branch 'mm/merge-in-dirty-worktree-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Jun 2013 22:07:43 +0000 (15:07 -0700)
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-merge.txt
Simple merge