t / t9601 / cvsroot / module / imported-twice.txt,von commit Merge branch 'ml/mailmap' into maint-1.7.6 (6d1cdad)
   1head    1.1;
   2branch  1.1.1;
   3access;
   4symbols
   5        vtag-2:1.1.1.2
   6        vtag-1:1.1.1.1
   7        vbranchA:1.1.1;
   8locks; strict;
   9comment @# @;
  10
  11
  121.1
  13date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  14branches
  15        1.1.1.1;
  16next    ;
  17
  181.1.1.1
  19date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  20branches;
  21next    1.1.1.2;
  22
  231.1.1.2
  24date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  25branches;
  26next    ;
  27
  28
  29desc
  30@@
  31
  32
  331.1
  34log
  35@Initial revision
  36@
  37text
  38@This is vtag-1 (on vbranchA) of imported-twice.txt.
  39@
  40
  41
  421.1.1.1
  43log
  44@Import (vbranchA, vtag-1).
  45@
  46text
  47@@
  48
  49
  501.1.1.2
  51log
  52@Import (vbranchA, vtag-2).
  53@
  54text
  55@d1 1
  56a1 1
  57This is vtag-2 (on vbranchA) of imported-twice.txt.
  58@
  59
  60