mergetools / gvimdiff2on commit Merge branch 'rs/commit-m-no-edit' (bf99231)
   1. "$MERGE_TOOLS_DIR/vimdiff"