projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55f56fe 81ed7b9)
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)
commiteeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e
tree81891c565f5c6d859225acafc807f8bf7eff5a7ctree | snapshot
parent55f56fee0765820d5c841e47b22f33f5a7253e16commit | diff
parent81ed7b9581f7eafb334824264abb492d85a5ffb8commit | diff
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
Git—the stupid content tracker