mergetools / gvimdiffon commit rebase -i: handle "Nothing to do" case with autostash (e4244eb)
   1. "$MERGE_TOOLS_DIR/vimdiff"