demandimport: blacklist gtk
Demandimport breaks gtk. You get a meaningless error about
'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk,
but this trips up many extension writers.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% Abort
rebase aborted
@ 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1