aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
diff options
context:
space:
mode:
authorChristian Halstrick <christian.halstrick@gmail.com>2010-10-25 08:37:59 -0400
committerCode Review <codereview-daemon@eclipse.org>2010-10-25 08:37:59 -0400
commitc234860765f1e16e234f834709cd127d16a883f3 (patch)
tree36e29c5d4de7d95dfbd140d59dc7cedd4f9d48f3 /org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java
parenta4f7992dfb7ac1931e89af9035b33604717cb2c9 (diff)
parent6f3b089188ef4937ab4e9970b0987b061000831e (diff)
downloadjgit-c234860765f1e16e234f834709cd127d16a883f3.tar.gz
jgit-c234860765f1e16e234f834709cd127d16a883f3.zip
Merge "Allow setting a filter in IndexDiff"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java')
0 files changed, 0 insertions, 0 deletions