]> source.dussan.org Git - jgit.git/commitdiff
Merge "Revert "Teach ResolveMerger to create more correct DirCacheEntry's""
authorShawn Pearce <sop@google.com>
Wed, 25 Jul 2012 14:59:32 +0000 (10:59 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Wed, 25 Jul 2012 14:59:32 +0000 (10:59 -0400)

Trivial merge