Merge changes I39bfefee,I47795987,I70d120fb,I58cc5e01,I96bee7b9master
[jgit.git] / org.eclipse.jgit.test / tst / org / eclipse / jgit / merge / 
tree4a7489cd34c3c076c43c7a44a52be5b604fbaf35
drwxr-xr-x   ..
-rw-r--r-- 5620 CherryPickTest.java
-rw-r--r-- 7295 MergeAlgorithmTest.java
-rw-r--r-- 13829 SimpleMergeTest.java