Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.egit.core.test / 
tree325fcb488ef9304efae70817a486dc8102074b06
drwxr-xr-x   ..
-rw-r--r-- 367 .classpath
-rw-r--r-- 5 .gitignore
-rw-r--r-- 659 .project
drwxr-xr-x - .settings
drwxr-xr-x - META-INF
-rw-r--r-- 76 build.properties
-rw-r--r-- 2344 org.spearce.egit.core--All-Tests.launch
drwxr-xr-x - src