diff tests/test-rename-dir-merge.t @ 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 0776a6cababe
children e9ae770eff1c
line wrap: on
line diff