user-manual: Document that "git merge" doesn't like uncommited changes.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sun, 22 Nov 2009 22:26:18 +0000 (23:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:07:28 +0000 (16:07 -0800)
commite63ec00...b2a0c89f0c1cbc4862dcef7c4a14a785
tree8d4aa3e...37aab9242f2bf4192c86d2991d6f23f8copy hash to clipboard (tree)
parent4c371f9...270792791f867d15f25b03f800ab35a1copy hash to clipboard (diff)
Documentation/user-manual.txt