mergetools / gvimdiff2on commit t5520: factor out common "failing autostash" code (44a59ff)
   1. "$MERGE_TOOLS_DIR/vimdiff"