.hgignore@5e6df4f502d3 (annotated)
.hgignore
Wed, 10 Apr 2019 12:54:24 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 10 Apr 2019 12:54:24 +0200
- changeset 561
- 5e6df4f502d3
- parent 266
- 8c44c5919691
- child 727
- 56e6b5ccbf11
- permissions
- -rw-r--r--
harmonizes output of push and pull
pull gets conflict counter, push uses the term conflict instead of skipped (the output also says conflict: ...)
|
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/.*$ |
|
266
8c44c5919691
more documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
4 | ^docs/src/build/.*$ |
|
1
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
5 | core$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
6 | ^.c?project$ |
|
1bcaac272cdf
added existing source code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
0
diff
changeset
|
7 | ^.settings/.*$ |
