![[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) |
* 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.
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge