merge-recursive: point the user to commit when file would be overwritten.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sun, 22 Nov 2009 22:26:17 +0000 (23:26 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Nov 2009 00:07:27 +0000 (16:07 -0800)
commit4c371f9...270792791f867d15f25b03f800ab35a1
tree8ca2bd7...fa1e7801039ed90faeb13706d235b492copy hash to clipboard (tree)
parent78d553b...d7b269bb22ebd8b1198657c37484a3a0copy hash to clipboard (diff)
Documentation/config.txt
advice.c
advice.h
merge-recursive.c