Mercurial > hg
comparison tests/test-merge-internal-tools-pattern.t @ 49621:55c6ebd11cb9 stable
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
This is useful so we can store other files in $TESTTMP
(in particular tests that use docket files (nodemap, dirstate-v2) keep
file uids in $TESTTMP/UID)
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Fri, 18 Nov 2022 13:47:29 +0000 |
parents | 50de08904c63 |
children | 2282d8ac0fa9 |
comparison
equal
deleted
inserted
replaced
49620:8cd39c20445e | 49621:55c6ebd11cb9 |
---|---|
4 | 4 |
5 Make sure HGMERGE doesn't interfere with the test: | 5 Make sure HGMERGE doesn't interfere with the test: |
6 | 6 |
7 $ unset HGMERGE | 7 $ unset HGMERGE |
8 | 8 |
9 $ hg init | 9 $ hg init repo |
10 $ cd repo | |
10 | 11 |
11 Initial file contents: | 12 Initial file contents: |
12 | 13 |
13 $ echo "line 1" > f | 14 $ echo "line 1" > f |
14 $ echo "line 2" >> f | 15 $ echo "line 2" >> f |