Mercurial > hg > mercurial-source

diff tests/test-trusted.py @ 16255:ca5cc2976574 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2012 16:28:08 -0500 (2012-03-13)
parents 95b0d4c1c9e1
children 681f7b9213a4
line wrap: on
line diff