summaryrefslogtreecommitdiff
path: root/sys/netipx
diff options
context:
space:
mode:
authorNiall O'Higgins <niallo@cvs.openbsd.org>2007-06-02 09:00:20 +0000
committerNiall O'Higgins <niallo@cvs.openbsd.org>2007-06-02 09:00:20 +0000
commit81fddecfcf1580d324a4de15baf9ff3794033919 (patch)
tree5a3a3796f93251ca11716d09e746c480ae55996d /sys/netipx
parent050c0b0e9dbd5c0589a4f397297d24ce914e4281 (diff)
don't try to parse a server conflict message as a date.
makes cvs remote merging with conflicts work a bit better. ok joris@ xsa@
Diffstat (limited to 'sys/netipx')
0 files changed, 0 insertions, 0 deletions