Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 15:e60d38aa42fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
1 { "total_rows":0, "offset":0, "rows":[]}