]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.2' 60/66660/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 16 Feb 2016 00:06:02 +0000 (01:06 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 16 Feb 2016 00:06:11 +0000 (01:06 +0100)
commitff5c756c79d1c10575b927cf3bb2eb1e1fcc391b
tree7e1cc99ff5c12fbd745e43954d8a44dce3af6905
parent514b11ddccc93cf21475cd3e61dde5d2ba8171f2
parent8c1d44e4366139ed971a98367962e7afb4893156
Merge branch 'stable-4.2'

* stable-4.2:
  Revert "Fix warnings about unchecked conversion of MergeResult"

Change-Id: I31c2e0679ad4cff77190858ac9a570d04841c386
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>