Public Git Hosting - egit/chris.git/commit

commit	a1a247c7fa4333860a0c629c32598048b8101c02
author	Robin Rosenberg <robin.rosenberg@dewire.com>
	Thu, 22 Jan 2009 23:28:10 +0000 (22 15:28 -0800)
committer	Robin Rosenberg <robin.rosenberg@dewire.com>
	Fri, 23 Jan 2009 22:31:30 +0000 (23 23:31 +0100)
tree	bec442f74362913df59312c2d62d40ee6bfa07f7	tree \| snapshot (tar.gz zip)
parent	60031381f52737a43b6411cc695be64e9a598b49	commit \| diff

Add a few simple merge test cases

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/create-second-pack		diff \| blob \| blame \| history
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/pack-3280af9c07ee18a87705ef50b0cc4cd20266cf12.idx	[new file with mode: 0644]	blob
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/pack-3280af9c07ee18a87705ef50b0cc4cd20266cf12.pack	[new file with mode: 0644]	blob
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/pack-9fb5b411fe6dfa89cc2e6b89d2bd8e5de02b5745.idx		diff \| blob \| blame \| history
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.idx		diff \| blob \| blame \| history
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/pack-df2982f284bbabb6bdb59ee3fcc6eb0983e20371.pack		diff \| blob \| blame \| history
org.spearce.jgit.test/tst-rsrc/org/spearce/jgit/test/resources/packed-refs		diff \| blob \| blame \| history
org.spearce.jgit.test/tst/org/spearce/jgit/lib/RepositoryTestCase.java		diff \| blob \| blame \| history
org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java	[new file with mode: 0644]	blob
org.spearce.jgit.test/tst/org/spearce/jgit/transport/TransportTest.java		diff \| blob \| blame \| history

Chris changes to egit