diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-08-20 08:33:20 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-08-20 14:52:23 -0400 |
| commit | 845d9de7ab790a1691237c8f3b7a6bf8787b3489 (patch) | |
| tree | 621987633d74e720cb54754605e537128aee9ceb /src/System/Process/Concurrent.hs | |
| parent | 5020a86907ade611324c66c82cf4ee074789bdd5 (diff) | |
pass --allow-unrelated-histories to git merge
Fixes merging the /usr/src/propellor git bundle with git 2.9.
Diffstat (limited to 'src/System/Process/Concurrent.hs')
0 files changed, 0 insertions, 0 deletions