Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 1326:76b2c7096d08
Merge with MPM.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 23 Sep 2005 00:06:49 -0700 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" touch b hg add b rm b hg commit -A -m"comment #1" -d "0 0"