mergetools / gvimdiffon commit Merge branch 'jk/stash-require-clean-index' (05c3967)
   1. "$MERGE_TOOLS_DIR/vimdiff"