Am Sonntag, den 13.07.2014, 17:08 +0100 schrieb Ru Vuott:
> 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
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 wh
