diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-21 14:02:44 -0700 |
| commit | 98ed062a923ac4bd03f7ec13b327d51ebfc3a76a (patch) | |
| tree | 458cead593c02c01ccf24a96c518383c1839706e /git-rebase.sh | |
| parent | Merge branch 'ob/imap-send-ssl-verify' (diff) | |
| parent | t7800: "defaults" is no longer a builtin tool name (diff) | |
| download | tgif-98ed062a923ac4bd03f7ec13b327d51ebfc3a76a.tar.xz | |
Merge branch 'da/difftool-fixes'
Minor maintenance updates to difftool, and updates to its tests.
* da/difftool-fixes:
t7800: "defaults" is no longer a builtin tool name
t7800: modernize tests
t7800: update copyright notice
difftool: silence uninitialized variable warning
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions