On 28/02/11 00:32, Sebastian Schuberth wrote: > Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx> > --- > Documentation/git-difftool.txt | 2 +- > Documentation/git-mergetool.txt | 2 +- > Documentation/merge-config.txt | 2 +- > contrib/completion/git-completion.bash | 2 +- > git-gui/lib/mergetool.tcl | 7 +++++++ > git-mergetool--lib.sh | 22 ++++++++++++++++++++-- > 6 files changed, 31 insertions(+), 6 deletions(-) Works for me. Tested-by: Chris Packham <judge.packham@xxxxxxxxx> -- 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