mergetools / vimdiff2on commit add simple tests of consistency across rebase types (2aad7ca)
   1. "$MERGE_TOOLS_DIR/vimdiff"