Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-12-10 00:06:47 +0000
committerMatthias Sohn2011-12-10 00:06:47 +0000
commite11af568285525f4d16bbefef5faae5fea2ef008 (patch)
tree5ea72631970da7889606bfa72e74a78b75172687 /org.eclipse.jgit.junit.http/pom.xml
parentd1dd3403ac6064eaa8c11c6954b41a51a7b11bb6 (diff)
parentc1f352c100278551a7a144b756983ed8a5990c41 (diff)
downloadjgit-e11af568285525f4d16bbefef5faae5fea2ef008.tar.gz
jgit-e11af568285525f4d16bbefef5faae5fea2ef008.tar.xz
jgit-e11af568285525f4d16bbefef5faae5fea2ef008.zip
Merge branch 'stable-1.2'
* stable-1.2: Fix version.sh Throw API exception when MergeCommand hits checkout conflicts Add methods for configuring platform emulation Fix history rendering not to occupy too many lanes Fix History rendering Change-Id: If71cc760423ae2b76c7435ca4830edc1745556de Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit.http/pom.xml')
0 files changed, 0 insertions, 0 deletions

Back to the top