Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/no-conflicts.json @ 0:6f11757c4811
first drop of the conflict editor - mostly model work
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Mon, 12 Sep 2011 11:47:48 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
-1:000000000000 | 0:6f11757c4811 |
---|---|
1 { "total_rows":0, "offset":0, "rows":[]} |