Mercurial > emacs
view src/.dbxinit @ 87767:90318261ac4d
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 15 Jan 2008 21:40:09 +0000 |
parents | 18e524802887 |
children |
line wrap: on
line source
ignore 14 catch 18 ignore 20 ignore 23 alias s step alias n next alias c cont alias st status alias r run alias l list alias f file alias q quit alias w where alias d delete alias p print