The failure above is a conflict during merging:
Committed revision 112.
+ cd work/trunk
+ [ -n lp:ido ]
+ bzr merge lp:ido
+N src/idoswitchmenuitem.c
+N src/idoswitchmenuitem.h
M NEWS
M configure.ac
M example/menus.c
M src/Makefile.am
Text conflict in configure.ac
1 conflicts encountered.
The failure above is a conflict during merging: nuitem. c nuitem. h
Committed revision 112.
+ cd work/trunk
+ [ -n lp:ido ]
+ bzr merge lp:ido
+N src/idoswitchme
+N src/idoswitchme
M NEWS
M configure.ac
M example/menus.c
M src/Makefile.am
Text conflict in configure.ac
1 conflicts encountered.