summaryrefslogtreecommitdiff
path: root/config.hs
diff options
context:
space:
mode:
authorJoey Hess2014-08-19 17:57:32 -0400
committerJoey Hess2014-08-19 17:57:32 -0400
commit5d92ed6ea773ae62344d114e8a1992fd61bd9445 (patch)
tree7177f6b64fff825baf4dd1e94df721abd08276a2 /config.hs
parentd289a222d5915e9307e0e7a9a51f342942a2fe2d (diff)
need to -s theirs or the merge is likely to fail
Diffstat (limited to 'config.hs')
0 files changed, 0 insertions, 0 deletions