diff tests/test-merge-commit.out @ 4948:6fd953d5faea

dirstate: break update into separate functions
author Matt Mackall <mpm@selenic.com>
date Sat, 21 Jul 2007 16:02:09 -0500
parents e7282dede8cd
children 17ed9b9a0d03
line wrap: on
line diff