]> source.dussan.org Git - jgit.git/commit
Merge "Optimize MergeAlgorithm if ours or theirs is empty"
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Tue, 17 May 2011 12:54:18 +0000 (08:54 -0400)
committerCode Review <codereview-daemon@eclipse.org>
Tue, 17 May 2011 12:54:18 +0000 (08:54 -0400)
commitd781554b79b50e5c3fe468373e87edf8957d7578
tree319c8f4409ac53987b7aba8cdc3813aff1c9f6a9
parentb13ca9121b8f2c6a0ebca1a2a12c4af7e75dfd20
parent0461ff4f0c7ef505c818dac95286fa852f16eef7
Merge "Optimize MergeAlgorithm if ours or theirs is empty"