Mercurial > hg
annotate tests/test-conflict.out @ 1351:0e2be889ccd7
Repair ancestor logic, fix up test cases
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 26 Sep 2005 16:52:47 -0700 |
parents | 5a034646e472 |
children | 7544700fd931 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 26 Sep 2005 16:52:47 -0700 |
parents | 5a034646e472 |
children | 7544700fd931 |