git-merge-one-file: fix longstanding stupid thinko
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Mar 2008 23:47:18 +0000 (16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Mar 2008 05:17:17 +0000 (22:17 -0700)
commit29dc133...9883f97618de6f03e8ffc5dc810d8786
treec89ed86...8f02e797999c10b98f6af3445698aab1copy hash to clipboard (tree)
parentdeda26b...935bdca8d140006b224a278ec0377a33copy hash to clipboard (diff)
git-merge-one-file.sh
t/t1004-read-tree-m-u-wf.sh