Hi Junio,
Please pull from the "mergetool" branch at:
git://repo.or.cz/git/mergetool.git mergetool
It contains the bug fixes for git mergetool discussed recently, and is
against the maint branch. Thanks!
- Ted
Junio C Hamano (1):
Mergetool generating blank files (1.5.3)
Theodore Ts'o (2):
mergetool: fix emerge when running in a subdirectory
mergetool: Fix typo in options passed to kdiff3
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
