diff 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 diff