From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 26 Dec 2011 22:52:32 +0000 (+0100)
Subject: Merge branch 'stable-1.2'
X-Git-Tag: v1.3.0.201202121842-rc4~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=067ccbfda7b1dd804341addff398b1d8720edc63;p=jgit.git

Merge branch 'stable-1.2'

* stable-1.2:
  JGit v1.2.0.201112221803-r
  Expose unmerged paths when revert fails
  Enforce the use of Java5 API:s only (with a few exceptions)

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

067ccbfda7b1dd804341addff398b1d8720edc63