Mercurial > hg

comparison tests/test-rename-dir-merge.t @ 27163:27b89a0957ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 13:43:55 -0800
parents ef1eb6df7071
children 602add6ad9e5
comparison
equal deleted inserted replaced
27162:4ab69be0ea15 27163:27b89a0957ec