Issue of hg-commit changes and hg-merge

> From: Gérard Talbot [mailto:css21testsuite@gtalbot.org]
> Sent: Tuesday, December 30, 2014 16:47

[snip]

> By the way, I'm having a nightmare trying to hg-commit changes and
> hg-merge ... .
> 
> $ hg heads
> 
> changeset:   6950:f88446e28ffa
> bookmark:    master
> tag:         tip
> parent:      6948:14f7e0e9696e
> parent:      6949:8aee821a731a
> user:        Zhiqiang Zhang
> date:        Tue Dec 30 14:15:28 2014 +0800
> summary:     Merge pull request #654 from zqzhang/remove-color-archive
> 
> changeset:   6945:cab2042eb775
> user:        Gérard Talbot
> date:        Tue Dec 30 01:13:21 2014 -0500
> summary:     1- inline-replaced-wm-rl-003.xht was filename-renamed

I just merged 2 pull requests after someone reviewed them at

https://github.com/w3c/csswg-test/pull/653

https://github.com/w3c/csswg-test/pull/654


Is this a problem of github-hg sync, Peter?

Thanks,
Zhiqiang

Received on Tuesday, 30 December 2014 08:57:34 UTC