Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diffdir @ 3407: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 | 096f1c73cdc3 |
children | 000d122071b5 |
line wrap: on
line source
#!/bin/sh hg init touch a hg add a hg ci -m "a" -d "1000000 0" echo 123 > b hg add b hg diff --nodates hg diff --nodates -r tip echo foo > a hg diff --nodates