diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:25:35 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:25:35 +0000 |
| commit | 6b23b52e534e6aa2634dd8edfa20c8c14d43fce7 (patch) | |
| tree | a58a1ccf994cd8a54a45d54bd1ea4dbdcd53e18c /usr.bin/asn1_compile | |
| parent | ac29ef06837ef123d1c4624789485f20819b5688 (diff) | |
warn if conflicts were found during the merge;
Diffstat (limited to 'usr.bin/asn1_compile')
0 files changed, 0 insertions, 0 deletions