Mercurial > hg

log tests/test-merge-revert2.t @ 29151:7996c3acc33b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -3 tip
age author description
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Mon, 26 May 2014 11:44:58 -0700 Pierre-Yves David merge: drop the quotes around commit description
Fri, 09 May 2014 18:09:11 -0700 Durham Goode update: specify custom conflict markers for update (BC)
less more | (0) -3 tip