Mercurial > hg
view tests/test-unrelated-pull @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | dac4bd67f6c5 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo 123 > a hg add a hg commit -m "a" -u a -d "1000000 0" cd .. mkdir b cd b hg init echo 321 > b hg add b hg commit -m "b" -u b -d "1000000 0" hg pull ../a hg pull -f ../a hg heads