mergetools / gvimdiff3on commit Merge branch 'js/add-e-clear-patch-before-stating' (7fa92ba)
   1. "$MERGE_TOOLS_DIR/vimdiff"