Mercurial > hg > ConflictEditor

comparison conflict-editor/src/test/resources/single-conflict.json @ 42:7380d8ff1a66 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bring up a message dialog if the selected database did not contain any conflicts
author dirk
date Thu, 05 Jan 2012 05:33:19 +0100
parents 6f11757c4811
children
comparison
equal deleted inserted replaced
41:0c36e54a85b5 42:7380d8ff1a66