os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expand contraction.

Browse source
This commit is contained in:
Joel Dahl 2006-02-05 20:02:32 +00:00
parent 1ea230918d
commit 74672fad07
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=27042
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
en_US.ISO8859-1/articles/p4-primer/article.sgml
View file

@ -409,7 +409,7 @@
moving changes from one part of the depot to another. It is most moving changes from one part of the depot to another. It is most
commonly done in conjunction with creating and maintaining commonly done in conjunction with creating and maintaining
branches. An integration is done when you want to initially branches. An integration is done when you want to initially
populate a branch, and it's done when you want to move subsequent populate a branch, and it is done when you want to move subsequent
changes in the branch from the parent to the child, or from the changes in the branch from the parent to the child, or from the
child to the parent. A common example of this is periodically child to the parent. A common example of this is periodically
integrating changes from the vendor &os; tree to your child branch integrating changes from the vendor &os; tree to your child branch