f1019b9738089650ed24ae24a41e1567f28ea269 - jgit

commit: f1019b9738089650ed24ae24a41e1567f28ea269
[log] [tgz]
author: Matthias Sohn <matthias.sohn@sap.com>
Fri Dec 16 08:49:59 2011 +0100
committer: Matthias Sohn <matthias.sohn@sap.com>
Fri Dec 16 08:50:49 2011 +0100
tree: 332f582bff1d0854f8c5f9e5ec8a03dbd3f0e263
parent: 84c80be1dc45885969e2d0fa0421f709b8706453 [diff]
parent: 78ebffd5f4a65a098a2a41b241747c54905be63d [diff]

Merge branch 'stable-1.2'

* stable-1.2:
  Add API checking using clirr
  Fix MergeCommandTest to pass if File.executable is not supported
  Fix ResolveMerger not to add paths with FileMode 0

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