diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-11-09 16:02:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-09 16:02:06 +0000 |
| commit | 3368e09b69057abfbe5548c8e29467e181212024 (patch) | |
| tree | b0d665cf9bac880837c42d0e5bdbf6163e1efa98 /cscript | |
| parent | 684ec3d7ba201649f33e9497ffd6cf57ef5b4cbf (diff) | |
Don't fail to build when we're on a merge commit.
Diffstat (limited to 'cscript')
0 files changed, 0 insertions, 0 deletions