diff tests/test-rebase-conflicts.out @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.
author Steve Borho <steve@borho.org>
date Fri, 22 May 2009 11:42:21 -0500
parents 45495d784ad6
children 4bb4895e1693
line wrap: on
line diff