diff tests/test-simplemerge.py @ 22578:939ce500c92a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 29 Sep 2014 17:23:38 -0500
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff