mergetools / gvimdiffon commit Merge branch 'jc/xstrfmt-null-with-prec-0' (3f80d16)
   1. "$MERGE_TOOLS_DIR/vimdiff"