Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 2759:19436facb073
hgcommand.vim: requirements & doc self-install more consistent; cosmetics
Check for availability of builtin system().
Set 'compatible' while sourcing script.
File operation during doc self-install:
Escape spaces in ex-commands.
Use quotes in system calls.
Incremented revision number(s).
Size of patch is due to cosmetic cleanups:
Removal of spaces at line endings.
<SID>Prefix to functions when called.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Wed, 02 Aug 2006 00:20:28 +0200 |
parents | e506c14382fd |
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" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"