t / t9602 / cvsroot / module / sub1 / default,von commit Merge branch 'jc/apply-blank-at-eof-fix' into maint (e63f87a)
   1head    1.2;
   2access;
   3symbols
   4        B_SPLIT:1.2.0.4
   5        B_MIXED:1.2.0.2
   6        T_MIXED:1.2
   7        B_FROM_INITIALS_BUT_ONE:1.1.1.1.0.4
   8        B_FROM_INITIALS:1.1.1.1.0.2
   9        T_ALL_INITIAL_FILES_BUT_ONE:1.1.1.1
  10        T_ALL_INITIAL_FILES:1.1.1.1
  11        vendortag:1.1.1.1
  12        vendorbranch:1.1.1;
  13locks; strict;
  14comment @# @;
  15
  16
  171.2
  18date    2003.05.23.00.17.53;    author jrandom; state Exp;
  19branches
  20        1.2.2.1
  21        1.2.4.1;
  22next    1.1;
  23
  241.1
  25date    2003.05.22.23.20.19;    author jrandom; state Exp;
  26branches
  27        1.1.1.1;
  28next    ;
  29
  301.1.1.1
  31date    2003.05.22.23.20.19;    author jrandom; state Exp;
  32branches;
  33next    ;
  34
  351.2.2.1
  36date    2003.05.23.00.31.36;    author jrandom; state Exp;
  37branches;
  38next    ;
  39
  401.2.4.1
  41date    2003.06.03.03.20.31;    author jrandom; state Exp;
  42branches;
  43next    ;
  44
  45
  46desc
  47@@
  48
  49
  501.2
  51log
  52@Second commit to proj, affecting all 7 files.
  53@
  54text
  55@This is sub1/default.
  56
  57Every directory in the `proj' project has a file named `default'.
  58
  59This line was added in the second commit (affecting all 7 files).
  60@
  61
  62
  631.2.4.1
  64log
  65@First change on branch B_SPLIT.
  66
  67This change excludes sub3/default, because it was not part of this
  68commit, and sub1/subsubB/default, which is not even on the branch yet.
  69@
  70text
  71@a5 2
  72
  73First change on branch B_SPLIT.
  74@
  75
  76
  771.2.2.1
  78log
  79@Modify three files, on branch B_MIXED.
  80@
  81text
  82@a5 2
  83
  84This line was added on branch B_MIXED only (affecting 3 files).
  85@
  86
  87
  881.1
  89log
  90@Initial revision
  91@
  92text
  93@d4 2
  94@
  95
  96
  971.1.1.1
  98log
  99@Initial import.
 100@
 101text
 102@@