##// END OF EJS Templates
filemerge: make `_maketempfiles()` more reusable...
filemerge: make `_maketempfiles()` more reusable `_maketempfiles()` is very specialized for its current use. I hope to use it also when creating temporary files for input for tools that do partial conflict resolution. That'll be possible if the function is more generic. Instead of passing in two contexts (for "other" and "base") and an optional path (for "local"), let's pass a single list of files to make backups for. Even if we don't end up using for partial conflict resolution, this is still a simplification (but I do have a WIP patch for partial conflict resolution and it is able to benefit from this). Differential Revision: https://phab.mercurial-scm.org/D12193
Martin von Zweigbergk -
r49637:f9033770 default
Show More
Name Size Modified Last Commit Author
/ contrib / automation / hgautomation
__init__.py Loading ...
aws.py Loading ...
cli.py Loading ...
linux.py Loading ...
pypi.py Loading ...
ssh.py Loading ...
try_server.py Loading ...
windows.py Loading ...
winrm.py Loading ...