aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-02-25 11:25:02 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-02-25 11:25:02 +0100
commit7244c288150a7c587e3c6fa6aec4986c05dc7abd (patch)
tree039b787f86e87454c2703a6339d83e1a13f23928 /org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java
parent850b55a9a1ac6e307c701e2f50176c6a338dfc5e (diff)
downloadjgit-7244c288150a7c587e3c6fa6aec4986c05dc7abd.tar.gz
jgit-7244c288150a7c587e3c6fa6aec4986c05dc7abd.zip
Prepare 5.7.0-SNAPSHOT builds
Change-Id: Ic4c83c0ed6cdef69890cc9c27b3aa35c3ff66240 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategyResolve.java')
0 files changed, 0 insertions, 0 deletions