Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/single-conflict.json @ 15:e60d38aa42fe
generate differences for missing keys either in the original document or in the conflicting document.
author | dirk |
---|---|
date | Fri, 16 Sep 2011 17:03:57 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
14:f2daf738299f | 15:e60d38aa42fe |
---|