diff tests/test-merge-remove.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 0a63e91c519d
children e4d7cbc94219
line wrap: on
line diff