diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:18:20 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:18:20 +0000 |
commit | cb5c020a75ba029c14531d3b1bfa9a47d7d08fcc (patch) | |
tree | 046d82b031f8384c3f373ca355991430abe04d45 /sys/arch/i386/conf/GENERIC | |
parent | 958f72378e7a655df96fc968a54fe365f727a8f1 (diff) |
correctly handle merge(1) and rcsmerge(1) -e and -E flags; tests and OK ray@.
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
0 files changed, 0 insertions, 0 deletions