diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-01 14:02:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-01 14:02:30 -0700 |
| commit | a225a2601014bf06ddba932c9dab6cc299ab5239 (patch) | |
| tree | b74f4243740b0e197707e3eacf161e111cad5513 /commit-slab.h | |
| parent | Sync with maint (diff) | |
| parent | mergetool-lib: fix default tool selection (diff) | |
| download | git-a225a2601014bf06ddba932c9dab6cc299ab5239.tar.gz git-a225a2601014bf06ddba932c9dab6cc299ab5239.zip | |
Merge branch 'da/mergetool-winmerge'
Hotfix for an earlier change already in 'master' that broke the
default tool selection for mergetool.
* da/mergetool-winmerge:
mergetool-lib: fix default tool selection
Diffstat (limited to 'commit-slab.h')
0 files changed, 0 insertions, 0 deletions