##// END OF EJS Templates
test: drop usage of `HGMERGE` in `test-lfconvert.t`...
Boris Feld -
r40504:1f0c5c9a default
parent child Browse files
Show More
@@ -124,11 +124,11 b' add some changesets to rename/remove/mer'
124 created new head
124 created new head
125 $ hg rm large normal3
125 $ hg rm large normal3
126 $ hg commit -q -m"remove large, normal3"
126 $ hg commit -q -m"remove large, normal3"
127 $ hg merge
127 $ HGMERGE= hg merge --config ui.merge=internal:merge
128 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
128 tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary
129 no tool found to merge stuff/maybelarge.dat
130 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u
129 merging sub/normal2 and stuff/normal2 to stuff/normal2
131 merging sub/normal2 and stuff/normal2 to stuff/normal2
130 warning: stuff/maybelarge.dat looks like a binary file.
131 warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
132 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
132 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
133 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
133 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
134 [1]
134 [1]
General Comments 0
You need to be logged in to leave comments. Login now