Andrew's git / gitweb.git / t/t9601/cvsroot/module/imported-modified-imported.txt,v
?
t / t9601 / cvsroot / module / imported-modified-imported.txt,von commit Merge git://ozlabs.org/~paulus/gitk (ffac48d)
   1head    1.2;
   2access;
   3symbols
   4        vtag-2:1.1.1.2
   5        vtag-1:1.1.1.1
   6        vbranchA:1.1.1;
   7locks; strict;
   8comment @# @;
   9
  10
  111.2
  12date    2004.02.09.15.43.14;    author kfogel;  state Exp;
  13branches;
  14next    1.1;
  15
  161.1
  17date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  18branches
  19        1.1.1.1;
  20next    ;
  21
  221.1.1.1
  23date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  24branches;
  25next    1.1.1.2;
  26
  271.1.1.2
  28date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  29branches;
  30next    ;
  31
  32
  33desc
  34@@
  35
  36
  371.2
  38log
  39@First regular commit, to imported-modified-imported.txt, on HEAD.
  40@
  41text
  42@This is a modification of imported-modified-imported.txt on HEAD.
  43It should supersede the version from the vendor branch.
  44@
  45
  46
  471.1
  48log
  49@Initial revision
  50@
  51text
  52@d1 2
  53a2 1
  54This is vtag-1 (on vbranchA) of imported-modified-imported.txt.
  55@
  56
  57
  581.1.1.1
  59log
  60@Import (vbranchA, vtag-1).
  61@
  62text
  63@@
  64
  65
  661.1.1.2
  67log
  68@Import (vbranchA, vtag-2).
  69@
  70text
  71@d1 1
  72a1 1
  73This is vtag-2 (on vbranchA) of imported-modified-imported.txt.
  74@
  75
  76