upstream/mercurial-mirror Files · mercurial/pure

RhodeCode Free Hosting

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

upstream » mercurial-mirror

RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add support for change/delete conflicts to the ':other' merge tool...

filemerge: add support for change/delete conflicts to the ':other' merge tool This, along with the previous patch to the :local merge tool, covers the full matrix of change/delete conflicts.

Siddharth Agarwal -


            r27037:a8908c13

default

Name	Size	Modified	Last Commit	Author
/ mercurial / pure
__init__.py	Loading ...
base85.py	Loading ...
bdiff.py	Loading ...
diffhelpers.py	Loading ...
mpatch.py	Loading ...
osutil.py	Loading ...
parsers.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