2014-04-14 11:20 GMT+02:00 Urmil Parikh <urmilpar...@gmail.com>:
> I assume last time when I merged and committed these files, they got
> committed as binary files.
>
> How do I find cause of them considered as binary and how do I fix them so
> that I can merge without any issues?

There are only three ways a file is considered binary:
1) The file contains NUL-bytes
2) The file contains lines longer than 8192 bytes
3) The filename matches the expression in the "binary-glob" setting.

Since your example doesn't have NUL-bytes neither long lines, your
"binary-glob" setting is the only thing I can think of.

Regards,
        Jan Nijtmans
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to