[stellation-res] misc revision main@@4 - add test 10 (Bugzilla 21819), t

[Dave Shields <shields@xxxxxxxxxxxxxx>]

2002-07-23    <shields@xxxxxxxxxxxxxx>

misc revision main@@4: add some tests
	
	* tests/scm/merge/test7/script.sh: 
	Fix problem in test, and add it to merge script.sh

	* tests/scm/merge/test10/script.sh: 
	Demonstrate problem with single-line artifact, Bugzilla 21819

	* tests/scm/merge/test11/script.sh: 
	Demonstrate problem with repeated merge, Bugzilla 21826

	* ChangeLog
	Start ChangeLog for this component

From now on, I will attempt to add a new test for each new bug that I discover or that
is assigned to me.
-- 
Dave Shields, IBM Research, shields@xxxxxxxxxxxxxx, http://www.eclipse.org/stellation