Mercurial > hg > ConflictEditor

view .hgignore @ 22:eea7df5137ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
directly compare the JsonNode objects that are returned as values for a given field name. Difference needs to preserve them so that the JsonNodes can be used when merging conflict JSON documents later.
author dirk
date Sun, 18 Sep 2011 09:35:43 +0200
parents e4275005761d
children 3201f93801d0
line wrap: on
line source


syntax: regexp
^conflict-editor/\.settings$
syntax: regexp
^conflict-editor/\.classpath$
syntax: regexp
^conflict-editor/\.project$
syntax: regexp
^conflict-editor/target$