Mercurial > hg > ConflictEditor

diff conflict-editor/src/test/resources/log4j.properties @ 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/log4j.properties	Mon Sep 12 11:47:48 2011 +0200
@@ -0,0 +1,7 @@
+
+# The usual stuff. Note that A1 is configured in root, not separately
+log4j.rootCategory = DEBUG, A1
+log4j.appender.A1 = org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout = org.apache.log4j.PatternLayout
+#log4j.appender.A1.layout.ConversionPattern = %d{MMM dd HH:mm:ss} [%t] %p %c - %m%n
+log4j.appender.A1.layout.ConversionPattern = %c{1} - %m%n