mergetools / vimdiff3on commit Merge branch 'ss/commit-squash-msg' (a6822e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"