Add a few simple merge test casesmaster
[egit/charleso.git] / org.spearce.jgit / src / org / spearce / jgit / treewalk / 
tree3196c634119673560c0f925ba206dbd0f620b9e1
drwxr-xr-x   ..
-rw-r--r-- 17565 AbstractTreeIterator.java
-rw-r--r-- 10040 CanonicalTreeParser.java
-rw-r--r-- 3056 EmptyTreeIterator.java
-rw-r--r-- 4430 FileTreeIterator.java
-rw-r--r-- 9172 NameConflictTreeWalk.java
-rw-r--r-- 29408 TreeWalk.java
-rw-r--r-- 12820 WorkingTreeIterator.java
drwxr-xr-x - filter