Mercurial > hg
comparison contrib/bash_completion @ 18325:297bf69966a0
merge: warn when internal:merge cannot merge symlinks
A follow-up to d084df89d948.
internal:merge should never be picked for merging symlinks ... but in the test
suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool
cleverness. Without any output it can be hard to figure out what happened and
where the problem is.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Jan 2013 01:05:11 +0100 |
parents | e49771e2d071 |
children | 69e4787b6867 |
comparison
equal
deleted
inserted
replaced
18324:2eae2f9e85ef | 18325:297bf69966a0 |
---|