view tests/test-mq-merge.out @ 4875:97dbf330069a

Re: mercurial.el and hg-version-other-window hg-version-other window is unimplemented in mercurial.el. The version below works for me, YMMV.
author jon.christopher@Rigaku.com
date Sat, 14 Jul 2007 11:27:58 -0500
parents a210b40d0860
children
line wrap: on
line source

adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty