Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 302579 Details for
Bug 442594
difference in merge behavior [i.e kdiff3] between mercurial 0.9.5 and 1.0
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
mergetools patch
mercurial-mergetools.hgrc.patch (text/plain), 595 bytes, created by
Neal Becker
on 2008-04-16 11:13:02 UTC
(
hide
)
Description:
mergetools patch
Filename:
MIME Type:
Creator:
Neal Becker
Created:
2008-04-16 11:13:02 UTC
Size:
595 bytes
patch
obsolete
>--- contrib/mergetools.hgrc.orig 2008-03-24 19:05:20.000000000 -0400 >+++ contrib/mergetools.hgrc 2008-04-15 15:27:46.000000000 -0400 >@@ -1,11 +1,12 @@ > # Some default global settings for common merge tools > > [merge-tools] >-kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output >+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output > kdiff3.regkey=Software\KDiff3 > kdiff3.regappend=\kdiff3.exe > kdiff3.fixeol=True > kdiff3.gui=True >+kdiff3.priority=1 > > gvimdiff.args=--nofork -d -g -O $local $other $base > gvimdiff.regkey=Software\Vim\GVim
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=302579">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 442594
: 302579