diff tests/test-pull-update.t @ 26934:2fb17f60bffa

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 12 Nov 2015 15:26:30 -0600
parents 76df01e56e7f
children 216cc65cf227
line wrap: on
line diff