Hello,
in fossil 1.21, I've a modified openoffice file. Then I run fossil update, and
it tells me there is a merge conflict with a binary file, that it cannot merge.
What I'm surprised about is that fossil overwrites my local changes with the
incoming ones. And the file with local changes
2012/3/1 Lluís Batlle i Rossell vi...@viric.name:
Hello,
in fossil 1.21, I've a modified openoffice file. Then I run fossil update,
and
it tells me there is a merge conflict with a binary file, that it cannot
merge.
What I'm surprised about is that fossil overwrites my local changes with
On Thu, Mar 1, 2012 at 8:03 AM, Leo Razoumov slonik...@gmail.com wrote:
2012/3/1 Lluís Batlle i Rossell vi...@viric.name:
Hello,
in fossil 1.21, I've a modified openoffice file. Then I run fossil
update, and
it tells me there is a merge conflict with a binary file, that it cannot
3 matches
Mail list logo
