Mercurial > hg
view tests/test-merge4.t @ 15658:971c55ce03b8 stable
largefiles: don't require a user cache (issue3088) (issue3155)
If the user cache path isn't specified in .hgrc, and it can't be constructed
from the environment, don't try to use that cache.
author | Kevin Gessner <kevin@fogcreek.com> |
---|---|
date | Thu, 15 Dec 2011 13:19:43 -0500 |
parents | 4c94b6d0fb1c |
children | 63c817ea4a70 |
line wrap: on
line source
$ hg init $ echo This is file a1 > a $ hg add a $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b $ hg commit -m "commit #1" $ hg update 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo This is file c1 > c $ hg add c $ hg commit -m "commit #2" created new head $ hg merge 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ rm b $ echo This is file c22 > c $ hg commit -m "commit #3"