mergetools / gvimdiff2on commit rebase: use 'git stash store' to simplify logic (20351bb)
   1. "$MERGE_TOOLS_DIR/vimdiff"