diff templates/error.tmpl @ 5708:f6bf89722e29

merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 22:47:44 -0600
parents 68ec7b9e09a4
children 2580d418e3f0
line wrap: on
line diff