Andrew's git / gitweb.git / diff
?
Merge branch 'mm/maint-hint-failed-merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (22:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 06:31:51 +0000 (22:31 -0800)
* 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.

No differences found