| commit | 1bbda312bb6f122b5e02e39ab0a4dcdd2c05733b | [log] [tgz] |
|---|---|---|
| author | Martin Fleck <mfleck@eclipsesource.com> | Tue Mar 14 12:53:36 2017 +0100 |
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | Mon Jun 26 04:50:24 2017 -0400 |
| tree | 4f372485eb5ce5776ae1fb98ed48a5080d4df94f | |
| parent | 7a23275b0791418731f7b6ab291bac3946239732 [diff] |
[514382] Pre-Merge on conflict can lead to data loss Ensure that pre-merge merges only diffs from the right side and leaves the diffs from the left side untouched. Contains tests. Bug: 514382 Change-Id: Ie24a595dca3da78d2eda7ea32510d3630b8def9a Also-by: Simon Delisle <simon.delisle@ericsson.com> Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>