Mercurial > hg > ConflictEditor
comparison conflict-editor/src/test/resources/single-conflict.json @ 13:e99bb691f7ce
add button panel
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Tue, 13 Sep 2011 08:24:35 +0200 |
parents | 6f11757c4811 |
children |
comparison
equal
deleted
inserted
replaced
12:18e126f0070b | 13:e99bb691f7ce |
---|