Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 21:4734cbeb8683

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
toString of Difference should properly quote the values and not quote null fields.
author dirk
date Sat, 17 Sep 2011 09:28:13 +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":[]}