Mercurial > hg > ConflictEditor

diff conflict-editor/src/test/resources/log4j.properties @ 33:cc648f83cdbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
author dirk
date Tue, 20 Sep 2011 17:47:59 +0200
parents 6f11757c4811
children
line wrap: on
line diff