Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/log4j.properties @ 27:d7f357434800
the current conflict is an ObjectNode now so there's less need for casts
author | dirk |
---|---|
date | Sun, 18 Sep 2011 11:27:55 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
26:ca9c62a68e87 | 27:d7f357434800 |
---|