mergetools / gvimdiff3on commit Merge branch 'lw/daemon-log-destination' (c2bd43d)
   1. "$MERGE_TOOLS_DIR/vimdiff"