Mercurial > hg > ConflictEditor

annotate .hgignore @ 36:8262e3a8ed6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use the selection index in conflict list from the event, get it from the list instead. If the selection is cleared in the list, the event will report a wrong index.
author dirk
date Fri, 07 Oct 2011 05:55:30 +0200
parents e4275005761d
children 3201f93801d0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
1
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
2 syntax: regexp
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
3 ^conflict-editor/\.settings$
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
4 syntax: regexp
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
5 ^conflict-editor/\.classpath$
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
6 syntax: regexp
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
7 ^conflict-editor/\.project$
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
8 syntax: regexp
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
9 ^conflict-editor/target$