Mercurial > hg > ConflictEditor

comparison conflict-editor/src/test/resources/single-conflict.json @ 1:9c42f25cd944

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use a Difference object to describe the diff
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 12 Sep 2011 12:03:28 +0200
parents 6f11757c4811
children
comparison
equal deleted inserted replaced
0:6f11757c4811 1:9c42f25cd944