Mercurial > hg > ConflictEditor

comparison conflict-editor/src/test/resources/log4j.properties @ 2:ebff95a55276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
basic GUI (not yet connected) for connecting to a DB and showing conflicts
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 13:31:59 +0200
parents 6f11757c4811
children
comparison
equal deleted inserted replaced
1:9c42f25cd944 2:ebff95a55276