From: Junio C Hamano 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.lorimer.id.au/gitweb.git/diff_plain/b371922aa5b972557cd143461250a9d360882285?ds=inline;hp=--cc 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