diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-18 10:16:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-18 10:16:55 -0800 |
commit | 3f78278beb9792368de7edbbb031c3a88e0038a1 (patch) | |
tree | 42d7a2d7309fffd683ddd62b507ae1d65bea1a64 /diffcore-break.c | |
parent | Merge branch 'master' of git://github.com/git-l10n/git-po (diff) | |
parent | difftool: honor --trust-exit-code for builtin tools (diff) | |
download | tgif-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.xz |
Merge branch 'da/difftool'
Fix-up to a new feature in 'master'.
* da/difftool:
difftool: honor --trust-exit-code for builtin tools
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions