Mercurial > hg
comparison tests/test-double-merge.t @ 18729:4e53ac3f466a stable
largefiles: updatelfiles should use working dir standins, not standins from p1
This makes a difference when working directory is dirty, especially when
merging with a revision for which we don't have largefiles.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 28 Feb 2013 13:45:18 +0100 |
| parents | a6fe1b9cc68f |
| children | 5ed6a375e9ca |
comparison
equal
deleted
inserted
replaced
| 18728:1e636f7b1cfe | 18729:4e53ac3f466a |
|---|