mergetools / gvimdiff3on commit Merge branch 'ps/stash-in-c' (e36adf7)
   1. "$MERGE_TOOLS_DIR/vimdiff"