fail pull/merge early in the middle of conflicted merge
authorJunio C Hamano <junkio@cox.net>
Mon, 1 Jan 2007 07:21:50 +0000 (23:21 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 1 Jan 2007 22:35:16 +0000 (14:35 -0800)
commitd1014a1...45a8aa90c8de2a5ac7624d8175f96724
treef70bf89...fec309c221cd9b7b5073f5e87d32eab5copy hash to clipboard (tree)
parent9d0524d...2f340fc49f9e175d966afb7dce3854bbcopy hash to clipboard (diff)
git-merge.sh
git-pull.sh