From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 9 Dec 2007 09:01:50 +0000 (-0800)
Subject: Merge branch 'pr/mergetool'
X-Git-Tag: v1.5.4-rc0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=05e74f4111b5ce5995dd1145f83398fe40a318e0;p=git.git

Merge branch 'pr/mergetool'

* pr/mergetool:
  Open external merge tool with original file extensions for all three files
---

05e74f4111b5ce5995dd1145f83398fe40a318e0