Mercurial > hg
view tests/test-merge-prompt.out @ 6456:db5324d3c257
Pager extension: switch it off if --debugger is set
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Thu, 03 Apr 2008 11:11:31 +0200 |
parents | 4b0c9c674707 |
children | 01ada7b1861d |
line wrap: on
line source
adding file1 adding file2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head # non-interactive merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) status: M file2 C file1 file1: 1 changed file2: 2 changed # interactive merge 0 files updated, 0 files merged, 1 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) status: file2: No such file or directory C file1 file1: 1 changed file2 does not exist # interactive merge with bad input 0 files updated, 0 files merged, 0 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response local changed file1 which remote deleted use (c)hanged version or (d)elete? unrecognized response local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? unrecognized response remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) status: M file2 R file1 file1 does not exist file2: 2 changed # interactive merge with not enough input 1 files updated, 0 files merged, 1 files removed, 0 files unresolved local changed file1 which remote deleted use (c)hanged version or (d)elete? remote changed file2 which local deleted use (c)hanged version or leave (d)eleted? abort: response expected failed status: file2: No such file or directory C file1 file1: 1 changed file2 does not exist