diff tests/test-rebase-pull.t @ 28532:ed75909c4c67

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Mar 2016 14:10:46 -0700
parents fac3a24be50e
children d7af9b4ae7dd
line wrap: on
line diff