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

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

hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258)...
hgweb: use patch.diff() to make sensible diffs (issue1223, issue1258) This gets us git diffs when enabled and doesn't pick erratic file parents.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r7309:e74a9173 default
Show More
test-merge-force.out
11 lines | 298 B | text/plain | TextLexer
/ tests / test-merge-force.out
History | Annotation | Raw |Copy content |Copy permalink
created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b