Mercurial > hg > ConflictEditor

diff conflict-editor/src/test/resources/single-conflict.json @ 4:c396004a4e55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement exception handling listeners, when selecting a conflict document, display all differences
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 14:27:04 +0200
parents 6f11757c4811
children
line wrap: on
line diff