diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-10 13:17:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-10 13:17:30 -0800 |
| commit | 0538b84027a8aba7e8b805e3ec8fceb3990023e5 (patch) | |
| tree | e9e2323b28d0eb1c7a3129c07e07d6e2a3c9f08c /git-gui/lib/mergetool.tcl | |
| parent | Merge branch 'jk/filter-process-fix' (diff) | |
| parent | alternates: re-allow relative paths from environment (diff) | |
| download | tgif-0538b84027a8aba7e8b805e3ec8fceb3990023e5.tar.xz | |
Merge branch 'jk/alt-odb-cleanup'
Fix a corner-case regression in a topic that graduated during the
v2.11 cycle.
* jk/alt-odb-cleanup:
alternates: re-allow relative paths from environment
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions