.hgignore@12bad63cf5a8 (annotated)
.hgignore
Thu, 17 Mar 2016 21:11:19 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 17 Mar 2016 21:11:19 +0100
- changeset 217
- 12bad63cf5a8
- parent 1
- 1bcaac272cdf
- child 266
- 8c44c5919691
- permissions
- -rw-r--r--
added resolve-conflicts and delete-conflicts commands
resolve-conflicts just removes the conflicts from the db and the next push would upload these files
delete-conflicts removes the conflics from the db and deletes the local files
|
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
1 | syntax:regexp |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
2 | ^nbproject/.*$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
3 | ^build/.*$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
4 | core$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
5 | ^.c?project$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
6 | ^.settings/.*$ |
