Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 32:a6388599b106

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not blindly cast to Component ... the source of the event may be some arbitrary object (e.g. a model)
author dirk
date Tue, 20 Sep 2011 17:21:03 +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":[]}