comparison tests/test-copy-move-merge.t @ 23048:ee5f834077be stable

merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents cb15835456cb
children bd625cd4e5e7
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be