mergetools / gvimdiff2on commit Merge branch 'jk/gettext-poison' into maint (2e1062d)
   1. "$MERGE_TOOLS_DIR/vimdiff"