summaryrefslogtreecommitdiff
path: root/Git/UnionMerge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-15 19:17:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-15 19:17:07 -0400
commit5c5ff2cb78230ca6311d49dc2573579af49d8c37 (patch)
treea06acc0ea97ff67c6ef15e77db2080a3f80ec051 /Git/UnionMerge.hs
parent80a0be5116ada2c718fa6db0a90100d24660beec (diff)
better error message
Diffstat (limited to 'Git/UnionMerge.hs')
0 files changed, 0 insertions, 0 deletions