|
@@ -85,7 +85,7 @@ export const ConflictDiffModal: FC<ConflictDiffModalProps> = (props) => {
|
|
|
revertButtons: false,
|
|
revertButtons: false,
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
- }, [codeMirrorRef, origin, request, latest]);
|
|
|
|
|
|
|
+ }, [codeMirrorRef, origin.revisionBody, request.revisionBody, latest.revisionBody]);
|
|
|
|
|
|
|
|
const onCancel = () => {
|
|
const onCancel = () => {
|
|
|
if (props.onCancel != null) {
|
|
if (props.onCancel != null) {
|