d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give an example of the more efficient conflict resolution command

Browse Source 
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.
This commit is contained in:
Doug Barton 2003-06-17 09:20:16 +00:00
parent 1ff15c57ef
commit e44548554b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bind/FREEBSD-Upgrade
View File

@ -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.