Mercurial > hg

diff tests/test-merge1.t @ 27652:cc91f3bc5461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_checkunknownfiles: rename 'aborts' to 'conflicts' In upcoming patches we'll be able to do more useful things than aborting.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents 6a6e78f84cc6
children 7b5c8c8a2f8c
line wrap: on
line diff