Andrew's git / gitweb.git / diff
?
Merge branch 'ss/mergetools-tortoise'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:42:01 +0000 (14:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:42:01 +0000 (14:42 -0800)
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

Trivial merge