Mercurial > hg > ConflictEditor

diff conflict-editor/src/test/resources/no-conflicts.json @ 0:6f11757c4811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
first drop of the conflict editor - mostly model work
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 11:47:48 +0200
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conflict-editor/src/test/resources/no-conflicts.json	Mon Sep 12 11:47:48 2011 +0200
@@ -0,0 +1,1 @@
+{ "total_rows":0, "offset":0, "rows":[]}