mergetools / gvimdiff3on commit Merge branch 'tg/stash-push-fixup' (6f7f11f)
   1. "$MERGE_TOOLS_DIR/vimdiff"