comparison .hgignore @ 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 5d0b94d3ad0c
children 4a064e1977f8
comparison
equal deleted inserted replaced
5707:76dd039c2bad 5708:f6bf89722e29