git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
authorElia Pinto <gitter.spiros@gmail.com>
Fri, 6 Jun 2014 14:55:51 +0000 (07:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 21:47:07 +0000 (14:47 -0700)
commit1cb4937...9540bd196848a59f9b7765b0622f725c
tree8430f42...6cb730e1d4bd7012f08b5d39715888decopy hash to clipboard (tree)
parentc82af12...1bde56fd7c3b984688ef7fe9f4c44b6ecopy hash to clipboard (diff)
git-mergetool.sh