aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2010-10-17 18:21:49 -0400
committerCode Review <codereview-daemon@eclipse.org>2010-10-17 18:21:49 -0400
commitdc5027dcef6f7f3753ed41469b18f264e3bcc791 (patch)
tree58d85dd1b2534a18096b911696a35195a462cf28 /org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
parent609c6dc3580653516038b4d677bfb2e735fd641f (diff)
parent0b51a4568835e95fe2fc88f9458d4a7368a9c691 (diff)
downloadjgit-dc5027dcef6f7f3753ed41469b18f264e3bcc791.tar.gz
jgit-dc5027dcef6f7f3753ed41469b18f264e3bcc791.zip
Merge "Allow pgm Main to be extended"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java')
0 files changed, 0 insertions, 0 deletions