diff options
| author | Joey Hess <joey@kitenet.net> | 2014-08-19 17:57:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-19 17:57:32 -0400 |
| commit | 5d92ed6ea773ae62344d114e8a1992fd61bd9445 (patch) | |
| tree | 7177f6b64fff825baf4dd1e94df721abd08276a2 /src/Utility/Process.hs | |
| parent | d289a222d5915e9307e0e7a9a51f342942a2fe2d (diff) | |
need to -s theirs or the merge is likely to fail
Diffstat (limited to 'src/Utility/Process.hs')
0 files changed, 0 insertions, 0 deletions