git.shadowcat.co.uk Git - p5sagit/p5-mst-13.2.git/commit

projects / p5sagit/p5-mst-13.2.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 07b7370 7cb3fdb)

author	Malcolm Beattie <mbeattie@sable.ox.ac.uk>
	Mon, 29 Sep 1997 16:44:16 +0000 (16:44 +0000)
committer	Malcolm Beattie <mbeattie@sable.ox.ac.uk>
	Mon, 29 Sep 1997 16:44:16 +0000 (16:44 +0000)
commit	8f95159f0f6f551c08c5f6e1a4d8807b332bc21a
tree	74361aedc5a1372fab26b8d5802ff1d156440208	tree \| snapshot
parent	07b7370725c6ec32f15c00e2d8d38d18f4b75a2d	commit \| diff
parent	7cb3fdbc2b45d54cfc6aac117f89b42d632cb3ed	commit \| diff

Start merge with maint-5.004 branch by creating an ancestral
branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.

p4raw-id: //depot/perl@77

global.sym	diff1 \|	diff2 \|	blob \| history
perl.h	diff1 \|	diff2 \|	blob \| history
pp.c	diff1 \|	diff2 \|	blob \| history
proto.h	diff1 \|	diff2 \|	blob \| history
run.c	diff1 \|	diff2 \|	blob \| history
sv.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.