Mercurial > hg > ConflictEditor

annotate .hgignore @ 42:7380d8ff1a66 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bring up a message dialog if the selected database did not contain any conflicts
author dirk
date Thu, 05 Jan 2012 05:33:19 +0100
parents 0c36e54a85b5
children
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
41
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 39
diff changeset
3 ^target$
0c36e54a85b5 add a site
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 39
diff changeset
4 syntax: regexp
7
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
5 ^conflict-editor/\.settings$
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/\.classpath$
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/\.project$
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
10 syntax: regexp
e4275005761d ignore unwanted files
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
11 ^conflict-editor/target$
39
3201f93801d0 add a module that generates a webstart package
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 7
diff changeset
12 syntax: regexp
3201f93801d0 add a module that generates a webstart package
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 7
diff changeset
13 ^webstart-package/target$