upstream/mercurial-mirror Files · mercurial/templates/paper

mergetools: avoid losing the merged version with meld...

mergetools: avoid losing the merged version with meld Add -o $output. When using Meld as intended (merge from left and right into the center panel), the merged version is written to the wrong file without this option ($base, a temporary file, which is ignored by Mercurial). Add meld.check=changed as a secondary safety net.

ronvoe12249 -


            r18971:c4266e9a

default

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / paper
bookmarks.tmpl	Loading ...
branches.tmpl	Loading ...
changeset.tmpl	Loading ...
diffstat.tmpl	Loading ...
error.tmpl	Loading ...
fileannotate.tmpl	Loading ...
filecomparison.tmpl	Loading ...
filediff.tmpl	Loading ...
filelog.tmpl	Loading ...
filelogentry.tmpl	Loading ...
filerevision.tmpl	Loading ...
footer.tmpl	Loading ...
graph.tmpl	Loading ...
header.tmpl	Loading ...
help.tmpl	Loading ...
helptopics.tmpl	Loading ...
index.tmpl	Loading ...
manifest.tmpl	Loading ...
map	Loading ...
notfound.tmpl	Loading ...
search.tmpl	Loading ...
shortlog.tmpl	Loading ...
shortlogentry.tmpl	Loading ...
tags.tmpl	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