![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 3 Dec 2009 21:52:54 +0000 (13:52 -0800) | ||
| commit | 24807f9d5bada2475fddd153365c1debfe1309bc | |
| tree | 5a16341ed3e937e0af47f57a6acbebe0df18f9cb | tree | snapshot |
| parent | d718c19bc686a15ed69cd7631e50613dd4901e03 | commit | diff |
| parent | e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785 | commit | diff |
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.
* 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 | | blob | history |