spectral updated this revision to Diff 7122.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2888?vs=7119&id=7122
REVISION DETAIL
https://phab.mercurial-scm.org/D2888
AFFECTED FILES
mercurial/configitems.py
mercurial/filemerge.py
tests/test-merge-t
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe349ad5cbb71: filemerge: use a single temp dir instead of
temp files (authored by spectral, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D2888?vs=7086&id=7119#toc
REPOSITORY
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This can help to remove the clutter from UIs that display just the filenames;
instead of seeing foo~local.C9ru9r.txt and foo~base.2DMV22.txt (in the /tmp
direct