Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 26:ca9c62a68e87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wire up the current value, conflict value and preview buttons
author dirk
date Sun, 18 Sep 2011 11:00:16 +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":[]}