diff options
| author | Robin Stocker <robin@nibor.org> | 2012-09-23 01:57:20 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2012-11-16 10:31:32 -0800 |
| commit | cdaded26b0711bfd99cc2990db25b4562540c3b5 (patch) | |
| tree | e036b301f6d625f19115c6602fbec7adf7d19740 /org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java | |
| parent | 20c829838ac101cf595ee9d4575d6b95a6d2c99d (diff) | |
| download | jgit-cdaded26b0711bfd99cc2990db25b4562540c3b5.tar.gz jgit-cdaded26b0711bfd99cc2990db25b4562540c3b5.zip | |
CheckoutCommand: Support checking out ours and theirs
The checkoutPaths body is split into two implementations, depending on
whether we are checking out the index or a branch. This improves
readability, as in the index case we now also need to have access to
DirCacheIterator.
Bug: 390147
Change-Id: I99fd599b25b2ace9bdd84535a56565286a3cb7f1
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ReflogTest.java')
0 files changed, 0 insertions, 0 deletions