Mercurial > hg

diff tests/test-annotate.t @ 27125:969ca40cad1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-changedelete.t: add a file with regular merge conflicts In upcoming patches we're going to move change/delete conflicts to the resolve phase -- it will be important to see how regular conflicts interact with change/delete ones.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Nov 2015 13:43:14 -0800
parents 56b2bcea2529
children 2f6d5c60f6fc
line wrap: on
line diff