diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-23 23:42:24 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-23 23:42:24 +0000 |
| commit | ab02a548e27c325d0364332d86de6ba7afd20f6c (patch) | |
| tree | b0bfd20118f26aed33ac22e3e4ad61efd1ef9211 /usr.bin/cdio | |
| parent | df2d40ebe4d8b073dd931571ce689dce2dde0e96 (diff) | |
reset overlapcnt at each cvs_merge_file() call so that files that
are being merged that have no conflicts will not report the previous
conflicts that might have been found.
Diffstat (limited to 'usr.bin/cdio')
0 files changed, 0 insertions, 0 deletions