mergetools / gvimdiff2on commit Merge branch 'nd/daemon-informative-errors-typofix' (0c52457)
   1. "$MERGE_TOOLS_DIR/vimdiff"