From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Nov 2009 06:31:51 +0000 (-0800)
Subject: Merge branch 'mm/maint-hint-failed-merge'
X-Git-Tag: v1.6.6-rc1~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=444e10df2a4159b5dd2975feadbb9e1213d65b47;p=git.git

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

* 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.
---

444e10df2a4159b5dd2975feadbb9e1213d65b47