summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:32:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-30 13:32:47 -0400
commit896726cde425f6c74273b35cde30c1909551ff66 (patch)
tree39f5c3f7636b53af79625866d845e50897d8fd1c /Annex.hs
parentf0497312a77d59f24c8273245ac324b02bb1eb13 (diff)
rename GitUnionMerge to Git.UnionMerge
Also, moved commit function into Git proper, it's not union merge specific.
Diffstat (limited to 'Annex.hs')
0 files changed, 0 insertions, 0 deletions