mergetools / gvimdiffon commit Merge branch 'jn/less-reconfigure' (bb07a3f)
   1. "$MERGE_TOOLS_DIR/vimdiff"