diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:01 -0800 |
| commit | eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e (patch) | |
| tree | 81891c565f5c6d859225acafc807f8bf7eff5a7c /test-sha1.sh | |
| parent | Merge branch 'jk/mergetool' (diff) | |
| parent | mergetools: teach tortoisemerge to handle filenames with SP correctly (diff) | |
| download | tgif-eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e.tar.xz | |
Merge branch 'ss/mergetools-tortoise'
Update mergetools to work better with newer merge helper tortoise ships.
* ss/mergetools-tortoise:
mergetools: teach tortoisemerge to handle filenames with SP correctly
mergetools: support TortoiseGitMerge
Diffstat (limited to 'test-sha1.sh')
0 files changed, 0 insertions, 0 deletions