| commit | 2007b6efd682ea6cf17806ef1e933fcc32cd7696 | [log] [tgz] |
|---|---|---|
| author | Knut Nesheim <knutin@gmail.com> | Tue Jan 07 17:10:59 2014 +0100 |
| committer | Knut Nesheim <knutin@gmail.com> | Tue Jan 07 17:10:59 2014 +0100 |
| tree | 479ca67ed7dc641609e1c7d93dc79e35e66840e3 | |
| parent | 6db3b0c5b86a1cad89583fe3b4fffe9916f3ad4d [diff] |
Let backend decide on merge strategy.