| commit | afda68ad95834f7bacc65296a1e73a645cd45d0c | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <emueller@eclipsesource.com> | Thu Aug 13 15:18:45 2015 +0200 |
| committer | Edgar Mueller <emueller@eclipsesource.com> | Thu Aug 13 15:19:01 2015 +0200 |
| tree | 7f24e42c88b59d16f5ca2be3706aa9b3d7948db3 | |
| parent | 40ce9a975257037091190746d0478bd777cd934b [diff] |
Bug 474896 - mergeResolvedConflicts does not correctly remove operation Also fixed some minor code issues along the way Change-Id: Ifd84148706f7f756938f61a981948f052f9cddb1