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

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

templatefilters: add filter to convert date to local date (issue1674)...
templatefilters: add filter to convert date to local date (issue1674) Issue1674 suggests the localdate filter be applied as default to log, but this patch only introduces the filter, not the changed default behaviour.
Augie Fackler - - Load All Authors

File last commit:

r7821:9fe7e6ac default
r8591:08c93b07 default
Show More
test-commit-unresolved.out
14 lines | 481 B | text/plain | TextLexer
/ tests / test-commit-unresolved.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
make commit fail when committing unresolved files
 r6888 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
Augie Fackler
merge: better error messages to lead users to hg update --clean to abandon merges....
 r7821 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
Stefano Tortarolo
make commit fail when committing unresolved files
 r6888
% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)
% Mark the conflict as resolved and commit