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 /Documentation/diff-config.txt | |
| parent | 55f56fee0765820d5c841e47b22f33f5a7253e16 (diff) | |
| parent | 81ed7b9581f7eafb334824264abb492d85a5ffb8 (diff) | |
| download | git-eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e.tar.gz | |
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 'Documentation/diff-config.txt')
0 files changed, 0 insertions, 0 deletions