GnuWin32 diff3 per_merger test failures
Bug #582974 reported by
Martin Packman
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Low
|
Unassigned |
Bug Description
When using the GnuWin32 diff3 binary, but not when using /bin/diff3 from within cygwin, the following three tests fail with unexpected carriage returns at the end of each line.:
bt.per_
bt.per_
bt.per_
Unlike diff, diff3 doesn't seem to have a --binary switch, so no obvious line endings fix to try there.
I expect this could cause real merge problems, but wasn't able to cook up an example.
tags: | added: check-for-breezy |
To post a comment you must log in.
I wonder if we could set the fd's to binary using native windows apis before the child process gets going ?