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

age author description
Mon, 08 Feb 2016 19:32:29 +0100 Pierre-Yves David destutil: allow to specify an explicit source for the merge
Mon, 08 Feb 2016 14:55:58 +0100 Pierre-Yves David merge: give priority to "not at head" failures for bare 'hg merge'
Tue, 02 Feb 2016 14:49:02 +0000 Pierre-Yves David update: warn about other topological heads on bare update