| commit | 444e10df2a4159b5dd2975feadbb9e1213d65b47 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Nov 2009 06:31:51 +0000 (23 22:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Nov 2009 06:31:51 +0000 (23 22:31 -0800) | ||
| tree | e0d4c7715d74c457f063c1b12105cf77cec60dae | treesnapshot (tar.gz zip) |
| parent | e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c | commitdiff |
| parent | e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785 | commitdiff |
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.
* 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 | diff1 | diff2 | blobhistory |
| Documentation/user-manual.txt | diff1 | diff2 | blobhistory |
| merge-recursive.c | diff1 | diff2 | blobhistory |