comparison tests/test-merge4.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Jan 2014 14:30:06 -0600
parents 63c817ea4a70
children 8561ad49915d
comparison
equal deleted inserted replaced
20213:8c69c69dbcd2 20306:fe8e254c7ad6