diff options
author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-01-20 14:01:38 -0500 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-01-20 14:01:38 -0500 |
commit | 910a69d4c8a892a71f4ac1f8c54f7d91887001d5 (patch) | |
tree | 461b98e89633db3dd14dc9501a7a09489e677148 /org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java | |
parent | 9f7b97c90ab065fa3d8fcc6392bda087664bbef9 (diff) | |
parent | baf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5 (diff) | |
download | jgit-910a69d4c8a892a71f4ac1f8c54f7d91887001d5.tar.gz jgit-910a69d4c8a892a71f4ac1f8c54f7d91887001d5.zip |
Merge "Improve handling of checkout conflicts"
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java')
0 files changed, 0 insertions, 0 deletions