Mercurial > hg

annotate tests/bundles/test-merge-symlinks.hg @ 17394:19e4861f9730 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: merging bookmarked heads 45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.
author John Li <jli@circularly.org>
date Mon, 27 Aug 2012 09:57:58 -0400
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: 5408
diff changeset
1 (binary:application/octet-stream)