git-merge-one-file: style cleanup
authorKevin Bracey <kevin@bracey.fi>
Sun, 24 Mar 2013 12:26:23 +0000 (14:26 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 17:50:27 +0000 (10:50 -0700)
commit333ea38...b95c77fad8b18daa80bbf0f96fee556c
tree11d926b...635b7ef2b49b22468f5a677d2d2794c0copy hash to clipboard (tree)
parent530333c...e851b68a3635ee5bcfe707799dab9b83copy hash to clipboard (diff)
git-merge-one-file.sh