mergetools / gvimdiff2on commit Merge branch 'jc/gettext-test-fix' (49f50f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"