Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 10:a5ef4fbfd90c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 13 Sep 2011 02:33:01 +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":[]}