From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Feb 2009 03:40:35 +0000 (-0800)
Subject: Merge branch 'cb/mergetool'
X-Git-Tag: v1.6.2-rc0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b371922aa5b972557cd143461250a9d360882285;p=git.git

Merge branch 'cb/mergetool'

* cb/mergetool:
  mergetool: fix running mergetool in sub-directories
  mergetool: Add a test for running mergetool in a sub-directory
  mergetool: respect autocrlf by using checkout-index
---

b371922aa5b972557cd143461250a9d360882285