comparison tests/cgienv @ 27125:969ca40cad1d

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 aa3f726a2bdb
children
comparison
equal deleted inserted replaced
27124:9c870e3efab7 27125:969ca40cad1d