git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55f56fe 81ed7b9)
Merge branch 'ss/mergetools-tortoise'
authorJunio C Hamano <redacted>
Thu, 7 Feb 2013 22:42:01 +0000 (14:42 -0800)
committerJunio C Hamano <redacted>
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
git clone https://git.99rst.org/PROJECT