summaryrefslogtreecommitdiff
path: root/Remote.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-25 18:37:56 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-25 18:42:43 -0400
commit588a981e17461643b67f9a372703b9e0896b6e17 (patch)
tree603d4ac50580573d50efcc27abc3c62018da8432 /Remote.hs
parent9449cb5a1a9d8e53863421cacdf9a908516bbd18 (diff)
fuzz test discovered a way automatic merge resultion can fail; fix
It may be that the directory we need to make a symlink in, to resolve the merge, doesn't exist locally.
Diffstat (limited to 'Remote.hs')
0 files changed, 0 insertions, 0 deletions