merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
59
third_party/git/t/t9602/cvsroot/module/sub2/Attic/branch_B_MIXED_only,v
vendored
Normal file
59
third_party/git/t/t9602/cvsroot/module/sub2/Attic/branch_B_MIXED_only,v
vendored
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
head 1.1;
|
||||
access;
|
||||
symbols
|
||||
B_MIXED:1.1.0.2;
|
||||
locks; strict;
|
||||
comment @# @;
|
||||
|
||||
|
||||
1.1
|
||||
date 2003.05.23.00.25.26; author jrandom; state dead;
|
||||
branches
|
||||
1.1.2.1;
|
||||
next ;
|
||||
|
||||
1.1.2.1
|
||||
date 2003.05.23.00.25.26; author jrandom; state Exp;
|
||||
branches;
|
||||
next 1.1.2.2;
|
||||
|
||||
1.1.2.2
|
||||
date 2003.05.23.00.48.51; author jrandom; state Exp;
|
||||
branches;
|
||||
next ;
|
||||
|
||||
|
||||
desc
|
||||
@@
|
||||
|
||||
|
||||
1.1
|
||||
log
|
||||
@file branch_B_MIXED_only was initially added on branch B_MIXED.
|
||||
@
|
||||
text
|
||||
@@
|
||||
|
||||
|
||||
1.1.2.1
|
||||
log
|
||||
@Add a file on branch B_MIXED.
|
||||
@
|
||||
text
|
||||
@a0 1
|
||||
This file was added on branch B_MIXED. It never existed on trunk.
|
||||
@
|
||||
|
||||
|
||||
1.1.2.2
|
||||
log
|
||||
@A single commit affecting one file on branch B_MIXED and one on trunk.
|
||||
@
|
||||
text
|
||||
@a1 3
|
||||
|
||||
The same commit added these two lines here on branch B_MIXED, and two
|
||||
similar lines to ./default on trunk.
|
||||
@
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue