Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2.out @ 1735:791405fe9991
i forgot to change the test output for test-hook.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 16 Feb 2006 14:34:59 -0800 |
parents | 5a034646e472 |
children | b2ae81a7df29 |