Re: [Qemu-devel] [PATCH] vnc: fix mismerge

2015-11-05 Thread Yang Hongyang
On 2015年11月05日 17:12, Gerd Hoffmann wrote: Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is specified" was rebased incorrectly, fix it. Reported-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/vnc.c b

Re: [Qemu-devel] [PATCH] vnc: fix mismerge

2015-11-05 Thread Markus Armbruster
Gerd Hoffmann writes: > Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is > specified" was rebased incorrectly, fix it. > > Reported-by: Markus Armbruster > Signed-off-by: Gerd Hoffmann > --- > ui/vnc.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/ui/vnc.c b/ui/vnc

[Qemu-devel] [PATCH] vnc: fix mismerge

2015-11-05 Thread Gerd Hoffmann
Commit "4d77b1f vnc: fix bug: vnc server can't start when 'to' is specified" was rebased incorrectly, fix it. Reported-by: Markus Armbruster Signed-off-by: Gerd Hoffmann --- ui/vnc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index a47f2b3..a4fc024 100644 --- a/ui/