mergetools / gvimdiffon commit add tests for rebasing merged history (3f21398)
   1. "$MERGE_TOOLS_DIR/vimdiff"