Mercurial > hg

diff tests/test-merge2.t @ 24110:756c5c8331b0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: add tests for change/remove conflicts There are currently no tests for change/remove conflicts of subrepos, and it's pretty broken. Add some tests demonstrating some of the breakages and fix the most obvious one (a KeyError when trying to look up a subrepo in the wrong context).
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 17 Feb 2015 23:20:55 -0800
parents f2719b387380
children 1850066f9e36
line wrap: on
line diff