Code review comment for lp:~charlesk/ido/nogtk2

Revision history for this message
Martin Mrazik (mrazik) wrote :

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.

« Back to merge proposal