Mercurial > hg
comparison tests/test-glog @ 5503:6f26c7677463
Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 02 Nov 2007 14:02:28 -0700 |
parents | 8d4fac0a9df7 |
children | 56e8a54bf71d |
comparison
equal
deleted
inserted
replaced
5502:a7248da55467 | 5503:6f26c7677463 |
---|