Tag server-side merges when incremental push tags are enabled

James Moger

2014-05-23 d62d883423c4f13e9514c203d2f0b14e4715df7f

 .gitignore

@@ -20,3 +20,10 @@
/data
/*.conf
/build-next.xml
/*.ps1
/*.sh
/*.factorypath
/src/main/dagger
/**/.idea
/**/init.lua
/**/session