aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2012-06-21 10:45:41 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2012-06-21 10:45:41 -0400
commit3c29bf094111308da2cea79fc36af1eff2f4da7a (patch)
tree5557c0e38700a062a0f3c9c80872f553123cb36a /org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
parentb0349227e4adb7aed9c23b8d2fb3686ea6f3a1ce (diff)
parent330c3cae728d113e5d2fd62124c26edfee45c7e2 (diff)
downloadjgit-3c29bf094111308da2cea79fc36af1eff2f4da7a.tar.gz
jgit-3c29bf094111308da2cea79fc36af1eff2f4da7a.zip
Merge "Serve 403 from RepositoryFilter on ServiceMayNotContinueException"
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java')
0 files changed, 0 insertions, 0 deletions