From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Jun 2013 22:07:43 +0000 (-0700)
Subject: Merge branch 'mm/merge-in-dirty-worktree-doc'
X-Git-Tag: v1.8.4-rc0~124
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a17e9ad15f77b739a33da703f695ad924cd825a?ds=inline;hp=--cc

Merge branch 'mm/merge-in-dirty-worktree-doc'

* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
---

9a17e9ad15f77b739a33da703f695ad924cd825a