comparison mercurial/extensions.py @ 26610:f9f82c444ff7

filemerge: only copy to backup during premerge step The premerge might leave the original file in an unclean state. Therefore it's important to only copy the file in the beginning.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 20:04:40 -0700
parents 5e0d80195a0f
children 1aee2ab0f902
comparison
equal deleted inserted replaced
26609:47681e77e484 26610:f9f82c444ff7