view .hgignore @ 643:2f6c4b61686a

Don't throw errors for merge into same branch
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 16 Sep 2013 21:51:32 +0400
parents a30befaa4349
children 0699b46a3d2a
line wrap: on
line source

classes
test-output
.iws
dist
mercurial.properties
syntax: glob
.idea/workspace.xml
out
.DS_Store