Ensure `git-pull` fails if `git-merge` fails.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:01 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Dec 2006 09:07:37 +0000 (01:07 -0800)
commitbf69958...fd7be26f7809858941fa831380e5bce7
tree3a2228b...f45b0e2e05f0bedabee839a6dacf8874copy hash to clipboard (tree)
parent0bb733c...1cb472a1a5b62381ff4037c6fb124e38copy hash to clipboard (diff)
git-pull.sh