mergetools / gvimdiff3on commit Merge branch 'jk/diff-files-assume-unchanged' (4144059)
   1. "$MERGE_TOOLS_DIR/vimdiff"