Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-commit-copy.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | 6990e499d71a |
children |
rev | line source |
---|---|
3675
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9 |
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 rev offset length base linkrev nodeid p1 p2 |
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 0 0 6 0 0 26d3ca0dfd18 000000000000 000000000000 |
6990e499d71a
Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 1 6 7 1 1 d267bddd54f7 26d3ca0dfd18 000000000000 |