mergetools / gvimdiffon commit Merge branch 'js/rerere-forget-protect-against-NUL' (5beeefe)
   1. "$MERGE_TOOLS_DIR/vimdiff"