diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-08 15:04:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-08 15:23:15 -0400 |
| commit | 3faf5f105c84689c766933dd89826ec6961cf100 (patch) | |
| tree | 732590812e7f63ddc32faa6265eb4d962054f2fd /Test.hs | |
| parent | 8df4e37f0dda20be0a13487f71bacf483aedaf58 (diff) | |
fix one more test failure with v6 unlocked file merge conflict resolution
Diffstat (limited to 'Test.hs')
0 files changed, 0 insertions, 0 deletions