mergetools / gvimdiffon commit Merge branch 'jk/log-missing-default-HEAD' into maint (5af77d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"