mergetools / gvimdiff2on commit Merge branch 'js/remote-curl-i18n' (aa1edf1)
   1. "$MERGE_TOOLS_DIR/vimdiff"