From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 22:42:01 +0000 (-0800)
Subject: Merge branch 'ss/mergetools-tortoise'
X-Git-Tag: v1.8.2-rc0~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e;p=git-core%2Fgit.git

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
---

eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e