Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 3323:39fd6e82ea38
merge: pull user messages out to hg.py
- add _update for shadowing in clone
- add _showstats helper
- remove update parameter defaults
- move stats message and merge help messages
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 10 Oct 2006 03:39:44 -0500 |
parents | 7544700fd931 |
children |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" touch b hg add b rm b hg commit -A -m"comment #1" -d "1000000 0"