Merge branch 'mm/merge-in-dirty-worktree-doc'
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
Junio C Hamano committed
Jun 26, 2013 at 15:07 UTC
9a17e9ad15f77b739a33da703f695ad924cd825a
No changes.