Show More
@@ -277,7 +277,7 b' class ui(object):' | |||
|
277 | 277 | insensitive. If ui is not interactive, the default is returned. |
|
278 | 278 | """ |
|
279 | 279 | if not self.interactive(): |
|
280 |
self. |
|
|
280 | self.write(msg, ' ', default, "\n") | |
|
281 | 281 | return default |
|
282 | 282 | while True: |
|
283 | 283 | try: |
@@ -4,6 +4,10 b' 2 files updated, 0 files merged, 0 files' | |||
|
4 | 4 | created new head |
|
5 | 5 | |
|
6 | 6 | # non-interactive merge |
|
7 | local changed file1 which remote deleted | |
|
8 | use (c)hanged version or (d)elete? c | |
|
9 | remote changed file2 which local deleted | |
|
10 | use (c)hanged version or leave (d)eleted? c | |
|
7 | 11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 12 | (branch merge, don't forget to commit) |
|
9 | 13 | status: |
@@ -304,6 +304,8 b' true.priority=1' | |||
|
304 | 304 | true.executable=cat |
|
305 | 305 | # hg update -C 1 |
|
306 | 306 | # hg merge -r 2 --config ui.merge=internal:prompt |
|
307 | no tool found to merge f | |
|
308 | keep (l)ocal or take (o)ther? l | |
|
307 | 309 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
308 | 310 | (branch merge, don't forget to commit) |
|
309 | 311 | # cat f |
@@ -512,6 +514,8 b' space' | |||
|
512 | 514 | revision 2 |
|
513 | 515 | space |
|
514 | 516 | merging f |
|
517 | output file f appears unchanged | |
|
518 | was merge successful (yn)? n | |
|
515 | 519 | merging f failed! |
|
516 | 520 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
517 | 521 | use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
General Comments 0
You need to be logged in to leave comments.
Login now