N/APosted on - 09/30/2013
The CygWin is an environment for Windows which makes it possible to port software running on POSIX systems such as Linux and Unix. I created a unified diff but it showed up an error as shown below.
The line “Index: “was not found!
Either this is not a diff file or the diff is empty.
CygWin environment TortoiseMerge shows error
The error is because TortiseMerge is not installed in the correct file path.
The solution to it is:
1) Go to 'MyComputer' > 'Properties' > 'Advanced' > 'EnvironmentVariables' > 'System Variables':Path
2) From Commannd Prompt, type following commands:
a) git config –replace –global diff.tool tortisemerge
b) git config –replace –global difftool.diffmerge.cmd "TortiseMerge.exe -base:"$BASE"-theirs:"REMOTE"-mine:"$LOCAL"-merged:"$MERGED"
c) git config –replace –global difftool.prompt false
3) Restart the system after executing the above commands and the error is resolved