Diff incorrect detects complete file different
From: Greg Irvine <greg.irvine_at_thalesatm.com>
Date: 2005-04-13 08:58:17 CEST
I'm having an issue while attempting to merge between branches.
The merging is detecting that the full contents of two files is different.
If I divide the two sections into two files and run a diff on that (unix
I've ensured the files are both using unix end-of-lines.
I have the same problem when doing the merge on linux, windows and within
I'm using subversion 1.1.1 on fedora core 2.
This is making it extremely difficult for me to merge at all because it does
Thanks for any advice.
This is an archived mail posted to the Subversion Users mailing list.