Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/no-conflicts.json @ 8:fca19925366c
rename the button to find conflicts
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Tue, 13 Sep 2011 02:07:14 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
7:e4275005761d | 8:fca19925366c |
---|