mergetool: honor -O<orderfile>
authorDavid Aguilar <davvid@gmail.com>
Sat, 8 Oct 2016 00:01:30 +0000 (17:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 17:04:31 +0000 (10:04 -0700)
commit654311b...6ee0fbf530c088271c2c76d46f31f82d
treea9139eb...933c04178ec29f99143b7a9c624a5ec0copy hash to clipboard (tree)
parent57937f7...a09c12ef484c290865dac4066d207c9ccopy hash to clipboard (diff)
Documentation/git-mergetool.txt
git-mergetool.sh
t/t7610-mergetool.sh