Files
git-mirror/git-mergetool--lib.sh
Junio C Hamano 3f78278beb Merge branch 'da/difftool'
Fix-up to a new feature in 'master'.

* da/difftool:
  difftool: honor --trust-exit-code for builtin tools
2014-11-18 10:16:55 -08:00

7.4 KiB