mergetool: simplify conditionals
authorDavid Aguilar <davvid@gmail.com>
Fri, 21 Nov 2014 01:20:29 +0000 (17:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Nov 2014 19:27:53 +0000 (11:27 -0800)
commit98a2602...0c9b464dbefce1a23e4c89ed7b6ccb4d
treee99aafb...11a087dd8a7c17654eb6695bd5bb856bcopy hash to clipboard (tree)
parentc41d3fe...d8a5dec2c2c991822b70b91c50ca047ecopy hash to clipboard (diff)
git-mergetool.sh