mergetools / vimdiff3on commit Merge branch 'bc/format-patch-null-from-line' (fbe959d)
   1. "$MERGE_TOOLS_DIR/vimdiff"