Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 1748:2428e6d66f06
bisect: fix for recent changes disallowing "false" merges
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 19 Feb 2006 18:59:20 +0100 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" touch b hg add b rm b hg commit -A -m"comment #1" -d "0 0"