Merge branch 'da/difftool'
Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools
Junio C Hamano committed
Nov 18, 2014 at 10:16 UTC
3f78278beb9792368de7edbbb031c3a88e0038a1
No changes.