How to compare files after rearranging lines?

Question

git

During the refactoring, the implementations of the methods were sorted by their names. The contents of the lines have not changed, only their sequence (in large blocks).
I have a branch based on the commit before the refactoring. P4merge, kdiff3 and meld failed to merge, they don't find relocations. Is there a difftool that can handle this, or where can I link the blocks manually?
base:

int b() {
    return 1;
}
int c() {
    return 2;
}
int a() {
    return 0;
}

local:

int a() {
    return 0;
}
int b() {
    return 1;
}
int c() {
    return 2;
}

Answer 1

There are no intersecting movements in the diffs - only lines that have been deleted, changed and added, git stores two copies of the file - before and after, there are no movements or any other similar information.
Such changes must be merged manually in interactive mode. It won't work automatically.

Answer 2

Upload files and compare them Winmerge winmerge.org/?lang=ru - it's free. It is convenient to compare files with it. Cheap and cheerful