revert most of d7a0084bf99d618d1dc26a54fd413db7ae8b8e63
[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"