mergetools / gvimdiff2on commit status: factor two rebase-related messages together (05eb563)
   1. "$MERGE_TOOLS_DIR/vimdiff"