diff tests/test-merge1 @ 2212:8164e3f31638

revert: require explicit revision when working dir has two parents.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 05 May 2006 10:31:03 -0700
parents 7544700fd931
children e506c14382fd
line wrap: on
line diff