Mercurial > hg > ConflictEditor

view .hgignore @ 10:a5ef4fbfd90c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 13 Sep 2011 02:33:01 +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$