upstream/mercurial-mirror Files · rust/hg-core/src

mergetools: add BeyondCompare 4 for Windows...

mergetools: add BeyondCompare 4 for Windows This is a copy of the TortoiseHg configuration, but dropping the 3-way diff and dirdiff settings (since those aren't supported in core Mercurial), and swapping the 'parent1', 'parent2', and 'base' literals for `$labellocal`, `$labelother, and `$labelbase` respectively. (That functionality was apparently never ported to TortoiseHg.) Additionally, the single quotes were removed from around these arguments, since none of the other configs have them. Differential Revision: https://phab.mercurial-scm.org/D9635

Matt Harbison -


            r46786:dbc462e3

default

Name	Size	Modified	Last Commit	Author
/ rust / hg-core / src
dirstate
operations
revlog
utils
ancestors.rs	Loading ...
copy_tracing.rs	Loading ...
dagops.rs	Loading ...
dirstate.rs	Loading ...
discovery.rs	Loading ...
filepatterns.rs	Loading ...
lib.rs	Loading ...
matchers.rs	Loading ...
repo.rs	Loading ...
requirements.rs	Loading ...
revlog.rs	Loading ...
testing.rs	Loading ...
utils.rs	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