##// END OF EJS Templates
upstream » mercurial-mirror
RSS

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

merge: minimize conflicts when common base is not shown (issue4447)...
merge: minimize conflicts when common base is not shown (issue4447) Previously, two changes that were nearly, but not quite, identical would result in large merge conflict regions that looked very similar, and were thus very confusing to users, and lead people used to other source control systems to claim that "mercurial's merge algorithms suck". In the relatively common case of a new file being introduced in two branches with very slight modifications, the old behavior would show the entire file as a conflict, and it would be very difficult for a user to determine what was going on. In the past, mercurial attempted to solve this with a "very smart" algorithm that would find all common lines, but this has significant problems as described in 2ea6d906cf9b. Instead, we use a "very dumb" algorithm introduced in the previous patch that simply matches lines at the periphery of conflict regions. This minimizes most conflict regions well, though there may still be some degenerate edge cases, like small modification to the beginning and end of a large file.
Aaron Jensen - - Load All Authors

File last commit:

r21057:19ee4923 default
r28072:c3e9269d default
Show More
map
18 lines | 530 B | text/plain | TextLexer
/ mercurial / templates / rss / map
History | Source | Raw |Copy content |Copy permalink
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 default = 'changelog'
mimetype = 'text/xml; charset={encoding}'
header = header.tmpl
changelog = changelog.tmpl
changelogentry = changelogentry.tmpl
filelog = filelog.tmpl
filelogentry = filelogentry.tmpl
tags = tags.tmpl
tagentry = tagentry.tmpl
Yuya Nishihara
hgweb: add missing bookmarks templates to atom/rss styles...
 r13858 bookmarks = bookmarks.tmpl
bookmarkentry = bookmarkentry.tmpl
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
 r18045 branches = branches.tmpl
branchentry = branchentry.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 error = error.tmpl
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
 r21057 filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'