| commit | 429000c605e12a361d55d109c3e37699c1325408 | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <edgar.m.mueller@gmail.com> | Thu Mar 27 10:45:39 2014 +0100 |
| committer | Edgar Mueller <edgar.m.mueller@gmail.com> | Thu Mar 27 10:48:32 2014 +0100 |
| tree | d310e96b7e3d89aee4ab9b878b0af3875d40478f | |
| parent | c4820d38aed95d9086b29f1d680ea29edc818013 [diff] |
Bug 431318 - Synthetic custom operations generated during conflict resolution are not considered (edit)
