mergetools / vimdiff3on commit Merge branch 'sg/commit-cleanup-scissors' (07528be)
   1. "$MERGE_TOOLS_DIR/vimdiff"