diff mercurial/merge.py @ 3803:792e61e9a00a

hgk: show view in short command list
author Matt Mackall <mpm@selenic.com>
date Tue, 05 Dec 2006 16:39:54 -0600
parents 6398ff7cb705
children 46abbed02b2d
line wrap: on
line diff