Mercurial > hg > dav / file revision

• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

.hgignore@12bad63cf5a8

.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

syntax:regexp
^nbproject/.*$
^build/.*$
core$
^.c?project$
^.settings/.*$