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
Junio C Hamano committed
Jul 21, 2013 at 22:51 UTC
4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279
No changes.