log tests/test-merge-changedelete.t @ 26947:fdfc50d09e8d

age author description
Wed, 11 Nov 2015 17:32:41 -0800 Siddharth Agarwal test-merge-prompt.t: rename to test-merge-changedelete.t base tests/test-merge-prompt.t@39d3e036f9be