mergetools / gvimdiff2on commit Merge branch 'kb/ancestry-path-threedots' (911439a)
   1. "$MERGE_TOOLS_DIR/vimdiff"