From 073fe4a3cb57c22f3c0a9ce772356cd5deab363f Mon Sep 17 00:00:00 2001 From: dougb Date: Tue, 17 Jun 2003 09:20:16 +0000 Subject: Give an example of the more efficient conflict resolution command suggested by the version of the commit message that's mailed out as opposed to the more error prone version that will be suggested when doing the actual import. --- contrib/bind/FREEBSD-Upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/bind/FREEBSD-Upgrade b/contrib/bind/FREEBSD-Upgrade index b522712..743d740 100644 --- a/contrib/bind/FREEBSD-Upgrade +++ b/contrib/bind/FREEBSD-Upgrade @@ -17,6 +17,8 @@ cvs import -m"Import of ISC BIND version 8.3.3" src/contrib/bind ISC v8_3_3 11. Resolve conflicts as needed. +cvs checkout -jISC:yesterday -jISC src/contrib/bind + Note: bin/nslookup/commands.l needs a different patch for the command line editing customization in -current and RELENG_4. -- cgit v1.1