diff Makefile @ 16254:c7eef052c9e3 stable

filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 This could result in a traceback.
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2012 15:12:26 -0500
parents 3ca419fb435e
children 0c4bec9596d8
line wrap: on
line diff