Hello, updating with last svn revision: #6373, I obtain this:
Conflict discovered in file 'trunk/comp/src/gb.report/.info'. Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: Ehmmm.... what do you suggest ? Thanks vuott ------------------------------------------------------------------------------ _______________________________________________ Gambas-user mailing list Gambas-user@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gambas-user