I have a couple of conflicted files and I don't have access to source branches (these files are detached from the repository. There isn't any .git folder and I don't have original versions). There are some conflicts marked by git-merge
:
<<<<<<< HEAD
sizeof(.......bla bla
||||||| merged common ancestors
sizeof(.......ble ble
=======
sizeof(.......blu blu
>>>>>>> refs/heads/TAGNAME
Is there a way to see such file in human-readable mode, i.e. parse a single file with marked conflicts and split it to a side-by-side view? I suppose Meld cannot do it, and KDiff3 seems to be unable to do the trick too.
git merge (tool) says that this isn't a Git repository.
git diff --no-index
requires two parameters (two files to compare), and as mentioned before I don't have the input files.
Use P4Merge to visualize the differences. You can set it up as the default tool used by Git-Diff and Git-Merge. Here is the effect.