summaryrefslogtreecommitdiff
path: root/git-union-merge.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-06 17:29:44 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-06 17:29:44 -0400
commit4233e81ef174d7891a8134656a67a6d40ea09ef9 (patch)
treed03021cbc2109db805de60220dfff7272719122a /git-union-merge.hs
parent9e2cea9f7a3fdea641371cd59f313a4cc6dc1630 (diff)
copy --auto was checking the wrong repo's preferred content. (--from was checking what --to should, and vice-versa.) Fixed this bug, which was introduced in version 5.20150727.
Diffstat (limited to 'git-union-merge.hs')
0 files changed, 0 insertions, 0 deletions