From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:52:54 +0000 (-0800)
Subject: Merge branch 'mm/maint-hint-failed-merge' into maint
X-Git-Tag: v1.6.5.5~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24807f9d5bada2475fddd153365c1debfe1309bc;p=git.git

Merge branch 'mm/maint-hint-failed-merge' into maint

* mm/maint-hint-failed-merge:
  user-manual: Document that "git merge" doesn't like uncommited changes.
  merge-recursive: point the user to commit when file would be overwritten.
---

24807f9d5bada2475fddd153365c1debfe1309bc