Mercurial > hg > ConflictEditor
view conflict-editor/src/test/resources/log4j.properties @ 15:e60d38aa42fe
generate differences for missing keys either in the original document or in the conflicting document.
author | dirk |
---|---|
date | Fri, 16 Sep 2011 17:03:57 +0200 |
parents | 6f11757c4811 |
children |
line wrap: on
line source
# 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