Merge branch 'pr/mergetool'
* pr/mergetool: Open external merge tool with original file extensions for all three files
Junio C Hamano committed
Dec 9, 2007 at 01:01 UTC
05e74f4111b5ce5995dd1145f83398fe40a318e0
No changes.