mergetools / vimdiff3on commit Merge branch 'sb/atomic-push' (3c6151d)
   1. "$MERGE_TOOLS_DIR/vimdiff"