comparison tests/test-merge-remove.t @ 26619:3b213a904b98

test-resolve.t: add some output to show order of operations This basically shows the behavior of resolve with multiple files. An upcoming behavior change will cause this output to also change.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 23:54:40 -0700
parents ddc17eaf0f1b
children 25e4b2f000c5
comparison
equal deleted inserted replaced
26618:8e6d5b7317e6 26619:3b213a904b98