mergetools / gvimdiff3on commit Merge branch 'ds/ewah-cleanup' (5d459c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"