view contrib/favicon.ico @ 4815:8808ea7da86b

merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 13:34:18 -0500
parents 0bf11906df28
children
line wrap: on
line source

(binary:image/vnd.microsoft.icon)