Mercurial > hg
comparison mercurial/help/merge-tools.txt @ 15498:ac5a340b26de stable
subrepo: use correct paths for subrepos with ..-relative paths on windows
posixpath normpath of c:\foo\bar/../baz is baz, so now we pconvert first.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Nov 2011 02:16:30 +0100 |
parents | 6eec9d7c6e0f |
children | 0c4bec9596d8 |
comparison
equal
deleted
inserted
replaced
15497:9bea3aed6ee1 | 15498:ac5a340b26de |
---|