You appear to be using a content revisioning system, attempted to merge two branches, and a conflict arose.
Imagine the following scenario:
Change Joe made Original file Change Jane made ... ... ... my $newVersion = '1'; my $newVersion = '1'; my $newVersion = '1'; my $oldVersion = "2"; my $oldVersion = "1"; my $oldVersion = "3"; ... ... ...
The merge tool cannot safely merge those, so it produced the text you're asking about and expects you to resolve the conflict manually.
In reply to Re: Multi_line error
by ikegami
in thread Multi_line error
by madhu.gopala
| For: | Use: | ||
| & | & | ||
| < | < | ||
| > | > | ||
| [ | [ | ||
| ] | ] |