Mercurial > hg > ConflictEditor

view .hgignore @ 33:cc648f83cdbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
author dirk
date Tue, 20 Sep 2011 17:47: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$