mergetools / gvimdiff2on commit add tests for rebasing root (6a6bc5b)
   1. "$MERGE_TOOLS_DIR/vimdiff"