git-merge: fail correctly when we cannot fast forward.
authorJunio C Hamano <junkio@cox.net>
Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800)
commit7d79c86...a6e2a8ceee10039153b47f0a8580607d
tree44e8371...28b304b0cf8eaa65097006f8a7867876copy hash to clipboard (tree)
parent64edf4b...eb19e5b94eda60c0e21d85e45602a8f1copy hash to clipboard (diff)
git-merge.sh