]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b1ade5 c32694e)
Merge branch 'master' into stable-6.2 34/193934/1
authorAndrey Loskutov <loskutov@gmx.de>
Fri, 3 Jun 2022 13:49:45 +0000 (15:49 +0200)
committerAndrey Loskutov <loskutov@gmx.de>
Fri, 3 Jun 2022 13:51:54 +0000 (15:51 +0200)
* master:
  Adapt diff- and merge tool code for PGM and EGit usage
  Teach JGit to handle external diff/merge tools defined in
.gitattributes

Change-Id: I3aefc14160caaac859bd3548460dd755ebe42fc5

1  2 
org.eclipse.jgit/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history

diff --cc org.eclipse.jgit/META-INF/MANIFEST.MF
Simple merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit