##// END OF EJS Templates
update: remove redundant and misplaced merge tests...
update: remove redundant and misplaced merge tests The "nothing to merge" case is covered by test-merge-default.t. The "uncommitted changes" case is covered by test-merge1.t (and others). The "merge -f" case is covered by test-merge-force.t.
Martin von Zweigbergk -
r23472:48cdf90f default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / atom
bookmarkentry.tmpl Loading ...
bookmarks.tmpl Loading ...
branchentry.tmpl Loading ...
branches.tmpl Loading ...
changelog.tmpl Loading ...
changelogentry.tmpl Loading ...
error.tmpl Loading ...
filelog.tmpl Loading ...
header.tmpl Loading ...
map Loading ...
tagentry.tmpl Loading ...
tags.tmpl Loading ...