Mercurial > hg > ConflictEditor

annotate .hgignore @ 22:eea7df5137ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
directly compare the JsonNode objects that are returned as values for a given field name. Difference needs to preserve them so that the JsonNodes can be used when merging conflict JSON documents later.
author dirk
date Sun, 18 Sep 2011 09:35:43 +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$