Mercurial > hg

comparison mercurial/tagmerge.py @ 26610:f9f82c444ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fa91c49a9b9f
children 5d92107dfb9b
comparison
equal deleted inserted replaced
26609:47681e77e484 26610:f9f82c444ff7