diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 20:56:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-02 21:31:48 +1100 |
| commit | 790235f64bafa315572fb3d32580ac8e068f98a1 (patch) | |
| tree | de4a79df7ef01baa0ae6bcaf01efa3f8c2237731 /test | |
| parent | abc0f7f0aa8966e9e046a4b177464f75f95afc99 (diff) | |
add another match on the error message to tell us we've encountered merge conflicts
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions