Mercurial > hg
view tests/test-diff-subdir @ 3442:798bcde0c9c2
merge: fix branch setting
(and remove debugging message)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Oct 2006 22:59:01 -0500 |
parents | 096f1c73cdc3 |
children |
line wrap: on
line source
#!/bin/sh hg init mkdir alpha touch alpha/one mkdir beta touch beta/two hg add alpha/one beta/two hg ci -m "start" -d "1000000 0" echo 1 > alpha/one echo 2 > beta/two echo EVERYTHING hg diff --nodates echo BETA ONLY hg diff --nodates beta echo INSIDE BETA cd beta hg diff --nodates .