mergetools / gvimdiff2on commit Merge branch 'jk/daemon-interpolate' into maint (c722ba4)
   1. "$MERGE_TOOLS_DIR/vimdiff"