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)
Junio C Hamano committed
Sep 29, 2007 at 15:39 UTC
d3759c08055d97434714f0b5afb592ddb0a544db
No changes.