mergetools / gvimdiff2on commit Merge branch 'sg/t3420-autostash-fix' (56ce87d)
   1. "$MERGE_TOOLS_DIR/vimdiff"