Mercurial > hg

diff tests/test-ssh.t @ 16001:fcf66193b186 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: defer symlink flag merging to filemerge (issue3200) Previously, we could change a normal file into a corrupt symlink when trying to merge a symlink flag. Now, we leave the flag alone and let filemerge deal with it (usually by a prompt). We also drop a redundant flag setting after filemerge (now dealt with by ms.resolve) that would cause similar corruption.
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jan 2012 20:34:57 -0600
parents cc021114fc98
children 90f8b8dd0326
line wrap: on
line diff