]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-1.2' 79/4879/1
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 26 Dec 2011 22:52:32 +0000 (23:52 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 26 Dec 2011 22:52:32 +0000 (23:52 +0100)
* 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>

Trivial merge