From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Tue, 17 May 2011 12:54:18 +0000 (-0400)
Subject: Merge "Optimize MergeAlgorithm if ours or theirs is empty"
X-Git-Tag: v1.0.0.201106011211-rc3~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d781554b79b50e5c3fe468373e87edf8957d7578;p=jgit.git

Merge "Optimize MergeAlgorithm if ours or theirs is empty"
---

d781554b79b50e5c3fe468373e87edf8957d7578