Mercurial > hg

log tests/test-merge-changedelete.t @ 27125:969ca40cad1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 23 Nov 2015 13:43:14 -0800 Siddharth Agarwal test-merge-changedelete.t: add a file with regular merge conflicts
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
less more | (0) tip