tree 479ca67ed7dc641609e1c7d93dc79e35e66840e3
parent 6db3b0c5b86a1cad89583fe3b4fffe9916f3ad4d
author Knut Nesheim <knutin@gmail.com> 1389111059 +0100
committer Knut Nesheim <knutin@gmail.com> 1389111059 +0100

Let backend decide on merge strategy.