Show More
@@ -89,7 +89,7 b' Update to link with local change should ' | |||||
89 | a: versions differ -> m |
|
89 | a: versions differ -> m | |
90 | preserving a for resolve of a |
|
90 | preserving a for resolve of a | |
91 | updating: a 1/1 files (100.00%) |
|
91 | updating: a 1/1 files (100.00%) | |
92 | couldn't find merge tool hgmerge |
|
92 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | |
93 | picked tool 'internal:prompt' for a (binary False symlink True) |
|
93 | picked tool 'internal:prompt' for a (binary False symlink True) | |
94 | no tool found to merge a |
|
94 | no tool found to merge a | |
95 | keep (l)ocal or take (o)ther? l |
|
95 | keep (l)ocal or take (o)ther? l |
General Comments 0
You need to be logged in to leave comments.
Login now