diff tests/test-doctest.py @ 16601:0c98820be15c

filectx: handle some other simple cases for finding merge ancestor
author Matt Mackall <mpm@selenic.com>
date Sun, 06 May 2012 14:20:53 -0500
parents db68ee3289b6
children 0d5a22f73a1f
line wrap: on
line diff