##// END OF EJS Templates
filemerge: rename _formatconflictmarker() since it formats a label...
filemerge: rename _formatconflictmarker() since it formats a label `_formatconflictmarker()`'s name made me think that it would create something like `<<<<<<<` and maybe some more stuff after it, but it's actually just the label that comes after on the same line. So let's rename it to `_formatlabel()`. That's better aligned with the variables the result is assigned it. Differential Revision: https://phab.mercurial-scm.org/D11801
Martin von Zweigbergk -
r49169:1eeec02c default
Show More
Name Size Modified Last Commit Author
/ rust / hg-core / src
config
copy_tracing
dirstate
dirstate_tree
operations
revlog
utils
ancestors.rs Loading ...
config.rs Loading ...
copy_tracing.rs Loading ...
dagops.rs Loading ...
dirstate.rs Loading ...
dirstate_tree.rs Loading ...
discovery.rs Loading ...
errors.rs Loading ...
exit_codes.rs Loading ...
filepatterns.rs Loading ...
lib.rs Loading ...
logging.rs Loading ...
matchers.rs Loading ...
repo.rs Loading ...
requirements.rs Loading ...
revlog.rs Loading ...
revset.rs Loading ...
testing.rs Loading ...
utils.rs Loading ...
vfs.rs Loading ...