Hello,
updating Gambas with rev. #6593, I have this message:
Conflict discovered in file 'trunk/comp/src/gb.eval.highlight/.startup'.
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: s
What choose do you suggest ?
Thanks
vuott