summaryrefslogtreecommitdiff
path: root/Command/ResolveMerge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-08-12 10:36:51 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-08-12 10:36:51 -0400
commit7f9940c1f4a6a533c1d5e7cd7980419f59524ff3 (patch)
tree3e05d15a1a0544f19713d99a4d513febe8c3c8d7 /Command/ResolveMerge.hs
parente588f9e1597aadfaf881b9a4b15007bd41479eed (diff)
fix test suite fail in LANG=C
This was caused by 88aeb849f620a13da47508045daae461a223c997 an Arbitrary String is not necessarily encoded using the filesystem encoding, and in a non-utf8 locale, encodeBS throws an exception on such a string. All I could think to do is limit test data to ascii. This shouldn't be a problem in practice, because the all Strings in git-annex that are not generated by Arbitrary should be loaded in a way that does apply the filesystem encoding.
Diffstat (limited to 'Command/ResolveMerge.hs')
0 files changed, 0 insertions, 0 deletions