summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test/META-INF
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2015-06-03 12:26:54 -0700
committerJonathan Nieder <jrn@google.com>2015-06-03 12:27:17 -0700
commit6227b340d33700bd3afe33cb0beacc286c0d4105 (patch)
tree1157afa1302415eaa966723f8f16549ba6f3c631 /org.eclipse.jgit.pgm.test/META-INF
parentdd22bc831a0ec47ecc999eb19be1bd8fad899e9b (diff)
parentfb21fb10fc76ffa886338a08d2a09cd76d339f2d (diff)
downloadjgit-6227b340d33700bd3afe33cb0beacc286c0d4105.tar.gz
jgit-6227b340d33700bd3afe33cb0beacc286c0d4105.zip
Merge branch 'stable-4.0'
* stable-4.0: Revert "Fix unchecked conversion warning in MergeFormatter" Delete deprecated TemporaryBuffer.LocalFile constructors Delete deprecated FileUtils.setExecute(File, boolean) Delete deprecated WorkingTreeIterator.isModified(DirCacheEntry, boolean) Delete deprecated UploadPackMayNotContinueException Delete deprecated TransferConfig.isFsckObjects() Delete deprecated TextBuiltin.out Delete deprecated Merger.getBaseCommit() Change-Id: Id23a39cc6a3cd122ff1738cb85b7451bbfd8af5f Signed-off-by: Jonathan Nieder <jrn@google.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test/META-INF')
0 files changed, 0 insertions, 0 deletions