mergetools / gvimdiffon commit Merge branch 'ks/tree-diff-nway' (8eaf517)
   1. "$MERGE_TOOLS_DIR/vimdiff"