merge-one-file: use empty blob for add/add base
authorJeff King <peff@peff.net>
Tue, 23 Feb 2016 06:04:41 +0000 (01:04 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Feb 2016 06:36:05 +0000 (22:36 -0800)
commit1a92e53...a3614105b7a58a4820f4d33f3cf33a3a
tree096f6cd...0e02e7c9774d2335a1e34c0ce2b5f443copy hash to clipboard (tree)
parenta2558fb...e1e387b630312311e1d22c95663da5d0copy hash to clipboard (diff)
git-merge-one-file.sh