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 /t/t4252-am-options.sh | |
| parent | ea4f93eb99038329bbd692c5c8246e5ec8c11da9 (diff) | |
| parent | 99474b6340dbcbe58f6c256fdee231cbadb060f4 (diff) | |
| download | git-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.gz git-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 't/t4252-am-options.sh')
0 files changed, 0 insertions, 0 deletions