mergetools / gvimdiffon commit Merge branch 'jk/daemon-user-doc' (8dd2858)
   1. "$MERGE_TOOLS_DIR/vimdiff"