]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eeeca80) | patch
Expose conflicting files in CheckoutConflictException 04/68104/3
authorNed Twigg <ned.twigg@diffplug.com>
Sat, 28 Jun 2014 03:22:03 +0000 (20:22 -0700)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 11 Apr 2016 20:55:16 +0000 (22:55 +0200)
commit32a5993227b5f43cb32becdf14d3efb6e88fa847
tree93608f2cd3d4acd0d1214a2d5b95102e78da65ddtree | snapshot
parenteeeca8042f39c2a46ae0acc1cce4a206b9b2d560commit | diff
Expose conflicting files in CheckoutConflictException

Change-Id: I5b3b7b0633354d5ccf0c6c320c0df9c93fdf8eeb
Signed-off-by: Ned Twigg <ned.twigg@diffplug.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit