Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-excessive-merge @ 3118:7a635ef25132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify tests for local changed/remote deleted
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:18:27 -0500
parents e506c14382fd
children ad3d5b4367cb
line wrap: on
line diff