mergetools / gvimdiff3on commit Merge branch 'nm/stash-untracked' (0ca2f32)
   1. "$MERGE_TOOLS_DIR/vimdiff"