diff contrib/buildrpm @ 3311:966632304dde

merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:16:06 -0500
parents ced5f5ceb172
children e5e6dd8ba6bb
line wrap: on
line diff