merge-one-file: fix "expr: non-numeric argument"
authorJay Soffian <jaysoffian@gmail.com>
Thu, 6 Oct 2011 18:25:55 +0000 (14:25 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 20:24:59 +0000 (13:24 -0700)
commitd30db56...5b03a45b2848fa9131c3485dc93f7dad
treeea1d54a...ab59c2617037033dc36fcf1e82ae1734copy hash to clipboard (tree)
parente923eae...901ff056421b9007adcbbce271caa7b6copy hash to clipboard (diff)
git-merge-one-file.sh