diff tests/test-mv-cp-st-diff.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 243ea5ffdf31
children c48924787eaa
line wrap: on
line diff