Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 5:ad2b4949967e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
group the conflicts list and the differences table in a split view
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 15:50:00 +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":[]}