comparison tests/test-double-merge.out @ 10592:1875dc1ac5f4 stable

Added tag 1.5 for changeset ff2704a8ded3
author Matt Mackall <mpm@selenic.com>
date Fri, 05 Mar 2010 18:26:12 -0600
parents f2618cacb485
children db426935fa94
comparison
equal deleted inserted replaced
10591:ff2704a8ded3 10592:1875dc1ac5f4