mergetools / gvimdiffon commit Merge branch 'lf/sideband-returns-void' (35d213c)
   1. "$MERGE_TOOLS_DIR/vimdiff"