Part of the problem is deciding how to represent the conflict for
such non-printable characters for such merge conflicts.
At the moment there are no good ideas about what whould be inserted into the
file as a conflict marker, and how then it would be handled.
If you have any good ideas for th
Hi all, I have a server that only supports the dumbest HTTP push over
WebDAV. The repository is secured by basic HTTP auth.
I face problems with push when using any other credential helper than netrc.
With netrc helper, pushes succeed.
With e.g. the Windows credential helper or Gnome Keyring he
