Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 23:8d5f791f1811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
author dirk
date Sun, 18 Sep 2011 09:37:40 +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":[]}