call merge tool properly
[xonotic/div0-gittools.git] / git-update-octopus
2010-01-20 Rudolf Polzersupport remote branches
2010-01-19 Rudolf Polzergit-update-octopus