From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Sep 2007 22:39:39 +0000 (-0700)
Subject: Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint
X-Git-Tag: v1.5.3.3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d3759c08055d97434714f0b5afb592ddb0a544db;p=git.git

Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

* 'mergetool' of git://repo.or.cz/git/mergetool:
  mergetool: Fix typo in options passed to kdiff3
  mergetool: fix emerge when running in a subdirectory
  Mergetool generating blank files (1.5.3)
---

d3759c08055d97434714f0b5afb592ddb0a544db