Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-subdir @ 5340:ad8783fe20f7
darcs2hg: Now detects and recovers from simple darcs conflicts.
author | Terry Smith <terry@t11e.com> |
---|---|
date | Tue, 11 Sep 2007 13:13:54 -0400 |
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 .