Merge branch 'fix/php-memcached-531' into v1.x
[awesomized/libmemcached] / git-config.sh
1 #!/bin/sh
2 git config merge.touch.name = "Keep this file"
3 git config merge.touch.driver = "touch %A"