Re: embarrassing problem with sysmerge

On Sat, Dec 5, 2015 at 5:56 PM, Antoine Jacoutot wrote: > On Sat, Dec 05, 2015 at 05:40:00PM +0900, Joel Rees wrote: >> About a week ago, I was trying to get cvs up to current, and I tried to do >> a sysmerge in my sleep after make build in src. >> >> When I realized I

embarrassing problem with sysmerge

About a week ago, I was trying to get cvs up to current, and I tried to do a sysmerge in my sleep after make build in src. When I realized I wasn't awake enough to merge /etc/login.conf correctly, I think I hit control-c. Now sysmerge doesn't want to do anything at all. Do I assume that

Re: embarrassing problem with sysmerge

On Sat, Dec 05, 2015 at 05:40:00PM +0900, Joel Rees wrote: > About a week ago, I was trying to get cvs up to current, and I tried to do > a sysmerge in my sleep after make build in src. > > When I realized I wasn't awake enough to merge /etc/login.conf correctly, I > think I hit control-c. > >