diff options
| author | peter <peter@FreeBSD.org> | 2004-04-15 01:01:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-04-15 01:01:56 +0000 |
| commit | 6045cae71a438a752980a395f03717a13cc22179 (patch) | |
| tree | fd220ac1ddaebaa4a730f86d6f727fb639279056 /contrib/cvs/FAQ | |
| parent | 0de1aa939e0bb1831fe5ba20e2afa2fe6d7426ab (diff) | |
| download | FreeBSD-src-6045cae71a438a752980a395f03717a13cc22179.zip FreeBSD-src-6045cae71a438a752980a395f03717a13cc22179.tar.gz | |
Import cvs-1.11.15
Diffstat (limited to 'contrib/cvs/FAQ')
| -rw-r--r-- | contrib/cvs/FAQ | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/cvs/FAQ b/contrib/cvs/FAQ index a7941d3..6d8f3c1 100644 --- a/contrib/cvs/FAQ +++ b/contrib/cvs/FAQ @@ -1897,7 +1897,9 @@ You can branch a branch. Note that according to the official GIC page at http://www.cpsc.ucalgary.ca/redirect/grouplab/projects/gic/ GIC is no longer being maintained and tkCVS is recommended - instead. For more on tkCVS, see http://www.cyclic.com/tkcvs/ + instead. + + For more on tkCVS, see http://www.cvshome.org/dev/addontkcvs.html. kingdon@cyclic.com @@ -4330,7 +4332,7 @@ kingdon@cyclic.com You should be able to run: - sort +0.1 ${dir1}/history ${dir2}/history > history + sort -k 1.2 ${dir1}/history ${dir2}/history > history If you "diff" a standard history file before and after such a sort, you might see other differences caused by garbage (split lines, nulls, |
