Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.jgit / src / org / spearce / jgit / dircache / 
treebfddcc55340926bcdb879c838aa80c268f65b356
drwxr-xr-x   ..
-rw-r--r-- 6680 BaseDirCacheEditor.java
-rw-r--r-- 23336 DirCache.java
-rw-r--r-- 4328 DirCacheBuildIterator.java
-rw-r--r-- 8384 DirCacheBuilder.java
-rw-r--r-- 8077 DirCacheEditor.java
-rw-r--r-- 15075 DirCacheEntry.java
-rw-r--r-- 6452 DirCacheIterator.java
-rw-r--r-- 17239 DirCacheTree.java