sub DoEdit { ... if ($isConflict) { print "\n<br><hr noshade size=1><p><strong>", T('This is the text you submitted:'), "</strong><p>", &GetTextArea('newtext', $newText, $editRows, $editCols), "<p>\n"; ############### ### added by gypark ### conflict 발생시 양쪽의 입력을 비교 my $conflictdiff = &GetDiff($oldText, $newText, 1); $conflictdiff = T('No diff available.') if ($conflictdiff eq ""); print "\n<br><hr noshade size=1><p><strong>", T('This is the difference between the saved text and your text:'), "</strong><p>", &DiffToHTML($conflictdiff), "<p>\n"; ### ############### } ... }
... This is the difference between the saved text and your text: 다음은 저장된 내용과 귀하가 작성한 내용 중 서로 다른 부분입니다: ...