mergetools / gvimdiff2on commit add tests for rebasing of empty commits (00b8be5)
   1. "$MERGE_TOOLS_DIR/vimdiff"