Fixed the problem with CFBuilder using the File->Convert Line Delimiters to (Windows format).
Thanks, Aaron On Wednesday, December 26, 2012 3:06:16 PM UTC-9, Dale Worley wrote: > > > From: Aaron Woehler <aaron....@alaska.gov <javascript:>> > > > > I have two files in my repository that started showing up as single > lines. > > How do I fix this? The files show up fine in Eclipse and other editors. > > > > Here is what git-gui shows me. > > > > @@ -1 +1 @@ > > -<cffunction name="table_data_input"><cfargument name="label" > > required="yes"><cfargument name="bindto" required="yes"> ............. > > \ No newline at end of file > > +<cffunction name="table_data_input"><cfargument name="label" > > required="yes"><cfargument name="bindto" required="yes"> ............. > > \ No newline at end of file > > > > > > *Environment:* > > Windows 7 > > Git-gui 0.17.gitgui > > git 1.8.0.msysgit.0 > > As the other responder said, it's likely a problem with the > line-ending characters. Probably the files have (or are fed to diff > with) only 0x0A for line-ending, but diff is expecting 0x0D 0x0A for > line-ending. Thus, diff sees no newlines. It may be complicated to > determine exactly where the problem is. Find whatever references you > can to how Git handles line-endings in text files in different > environments. > > Dale > --
