Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/no-conflicts.json @ 35:a3f88353554a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use a custom combo box model, instead fill a default one from preferences and attach an action listener to the combo that ensures that yet unknown database URLs will be stored in preferences.
author dirk
date Fri, 07 Oct 2011 05:41:53 +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":[]}