upstream/mercurial-mirror Files · hgext/largefiles

test-merge-tools.t: add 'hg resolve --list' output to tests...

test-merge-tools.t: add 'hg resolve --list' output to tests In upcoming patches we're going to be making some improvements to the ':prompt' merge tool, and one of them is recovering appropriately from exceptions. It is important in such cases to make sure that the merge state is written out properly. I went through the output and verified that it all makes sense.

Siddharth Agarwal -


            r26897:da1c706c

default

Name	Size	Modified	Last Commit	Author
/ hgext / largefiles
CONTRIBUTORS	Loading ...
__init__.py	Loading ...
basestore.py	Loading ...
lfcommands.py	Loading ...
lfutil.py	Loading ...
localstore.py	Loading ...
overrides.py	Loading ...
proto.py	Loading ...
remotestore.py	Loading ...
reposetup.py	Loading ...
uisetup.py	Loading ...
wirestore.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages