Merge branch 'mm/maint-hint-failed-merge'
commit444e10df2a4159b5dd2975feadbb9e1213d65b47
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (23 22:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (23 22:31 -0800)
treee0d4c7715d74c457f063c1b12105cf77cec60dae
parente61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c
parente63ec003b2a0c89f0c1cbc4862dcef7c4a14a785
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.
Documentation/config.txt
Documentation/user-manual.txt
merge-recursive.c