Mercurial > hg

comparison hgmerge @ 5503:6f26c7677463

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f53d97d651f4
children 3c80ecdc1bcd
comparison
equal deleted inserted replaced
5502:a7248da55467 5503:6f26c7677463