Mercurial > hg

diff tests/test-rename-dir-merge.t @ 26574:f82cb7dffb49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge._xmerge: drop no longer necessary 'if r:' check Cleanup from an earlier patch to make premerge be directly called from the main filemerge function.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 08 Oct 2015 14:18:43 -0700
parents bd625cd4e5e7
children ef1eb6df7071
line wrap: on
line diff