Mercurial > hg > ConflictEditor

view .hgignore @ 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 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$