mergetools / gvimdiff3on commit Merge branch 'js/fsmonitor-refresh-after-discarding-index' (cfd635c)
   1. "$MERGE_TOOLS_DIR/vimdiff"