mergetools / gvimdiff2on commit Merge branch 'jc/fsck-nul-in-commit' (6bfb7de)
   1. "$MERGE_TOOLS_DIR/vimdiff"