t / t9602 / cvsroot / module / sub1 / subsubA / default,von commit Merge branch 'jk/maint-merge-msg-fix' (b21f9e7)
   1head    1.3;
   2access;
   3symbols
   4        B_SPLIT:1.3.0.4
   5        B_MIXED:1.3.0.2
   6        T_MIXED:1.3
   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.3
  18date    2003.05.23.00.17.53;    author jrandom; state Exp;
  19branches
  20        1.3.4.1;
  21next    1.2;
  22
  231.2
  24date    2003.05.23.00.15.26;    author jrandom; state Exp;
  25branches;
  26next    1.1;
  27
  281.1
  29date    2003.05.22.23.20.19;    author jrandom; state Exp;
  30branches
  31        1.1.1.1;
  32next    ;
  33
  341.1.1.1
  35date    2003.05.22.23.20.19;    author jrandom; state Exp;
  36branches;
  37next    ;
  38
  391.3.4.1
  40date    2003.06.03.03.20.31;    author jrandom; state Exp;
  41branches;
  42next    ;
  43
  44
  45desc
  46@@
  47
  48
  491.3
  50log
  51@Second commit to proj, affecting all 7 files.
  52@
  53text
  54@This is sub1/subsubA/default.
  55
  56Every directory in the `proj' project has a file named `default'.
  57
  58This line was added by the first commit (affecting two files).
  59
  60This line was added in the second commit (affecting all 7 files).
  61@
  62
  63
  641.3.4.1
  65log
  66@First change on branch B_SPLIT.
  67
  68This change excludes sub3/default, because it was not part of this
  69commit, and sub1/subsubB/default, which is not even on the branch yet.
  70@
  71text
  72@a7 2
  73
  74First change on branch B_SPLIT.
  75@
  76
  77
  781.2
  79log
  80@First commit to proj, affecting two files.
  81@
  82text
  83@d6 2
  84@
  85
  86
  871.1
  88log
  89@Initial revision
  90@
  91text
  92@d4 2
  93@
  94
  95
  961.1.1.1
  97log
  98@Initial import.
  99@
 100text
 101@@