annotate tests/bundles/test-no-symlinks.hg @ 48152:8f88307f8e07

dirstate-item: replace another usage of `merged` We simply spell out the logic here. This was the last usage of `merged`. Differential Revision: https://phab.mercurial-scm.org/D11596
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:29:33 +0200
parents cd3032437064
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14116
cd3032437064 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 5089
diff changeset
1 (binary:application/octet-stream)