Mercurial > hg > ConflictEditor

comparison conflict-editor/src/test/resources/single-conflict.json @ 29:fc8f3ac948df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement resolving the conflict
author dirk
date Sun, 18 Sep 2011 19:06:59 +0200
parents 6f11757c4811
children
comparison
equal deleted inserted replaced
28:0bed77e3608e 29:fc8f3ac948df