Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/log4j.properties @ 26:ca9c62a68e87
wire up the current value, conflict value and preview buttons
author | dirk |
---|---|
date | Sun, 18 Sep 2011 11:00:16 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
25:7593675c1eff | 26:ca9c62a68e87 |
---|