mergetools / gvimdiff3on commit status: add new tests for status during rebase -i (592e412)
   1. "$MERGE_TOOLS_DIR/vimdiff"