Be more user-friendly when refusing to do something because of conflict.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Tue, 12 Jan 2010 09:54:44 +0000 (10:54 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2010 21:17:08 +0000 (13:17 -0800)
commitd38a30d...7dd54c5c6883af1de1a03ec7d523cee5
tree2f6f9f0...d8ad66bcee2b7ba56384909450b1144dcopy hash to clipboard (tree)
parent902f235...78cb2b2f6dd5dd664b9630c95321f0aecopy hash to clipboard (diff)
Documentation/config.txt
advice.c
advice.h
builtin-commit.c
builtin-merge.c
builtin-revert.c
git-pull.sh
t/t3030-merge-recursive.sh
t/t3501-revert-cherry-pick.sh