David Aguilar, 30.03.2009: > +# Runs a side-by-side merge tool > +run_merge_tool() > +{ > + merge_tool="$1" > + > + # base_present is always false when !mergetool_mode > + case "$merge_tool" in > + kdiff3) > [...] Kompare is missing here. Note, that this is only diff tool, not for merges. Markus -- 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