Andrew's git / gitweb.git / t/t9601/cvsroot/module/imported-modified.txt,v
?
t / t9601 / cvsroot / module / imported-modified.txt,von commit Merge branch 'jc/maint-blank-at-eof' (9981c80)
   1head    1.2;
   2access;
   3symbols
   4        vtag-1:1.1.1.1
   5        vbranchA:1.1.1;
   6locks; strict;
   7comment @# @;
   8
   9
  101.2
  11date    2004.02.09.15.43.14;    author kfogel;  state Exp;
  12branches;
  13next    1.1;
  14
  151.1
  16date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  17branches
  18        1.1.1.1;
  19next    ;
  20
  211.1.1.1
  22date    2004.02.09.15.43.13;    author kfogel;  state Exp;
  23branches;
  24next    ;
  25
  26
  27desc
  28@@
  29
  30
  311.2
  32log
  33@Commit on HEAD.
  34@
  35text
  36@This is a modification of imported-modified.txt on HEAD.
  37It should supersede the version from the vendor branch.
  38@
  39
  40
  411.1
  42log
  43@Initial revision
  44@
  45text
  46@d1 2
  47a2 1
  48This is vtag-1 (on vbranchA) of imported-modified.txt.
  49@
  50
  51
  521.1.1.1
  53log
  54@Import (vbranchA, vtag-1).
  55@
  56text
  57@@
  58
  59