Mercurial > hg > ConflictEditor

annotate conflict-editor/src/test/resources/log4j.properties @ 1:9c42f25cd944

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use a Difference object to describe the diff
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 12:03:28 +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
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
2 # The usual stuff. Note that A1 is configured in root, not separately
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
3 log4j.rootCategory = DEBUG, A1
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
4 log4j.appender.A1 = org.apache.log4j.ConsoleAppender
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
5 log4j.appender.A1.layout = org.apache.log4j.PatternLayout
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
6 #log4j.appender.A1.layout.ConversionPattern = %d{MMM dd HH:mm:ss} [%t] %p %c - %m%n
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
7 log4j.appender.A1.layout.ConversionPattern = %c{1} - %m%n