[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] About merge_into_workspace...
From: |
Richard Levitte - VMS Whacker |
Subject: |
[Monotone-devel] About merge_into_workspace... |
Date: |
Sat, 03 Mar 2007 11:46:22 +0100 (CET) |
Hi,
I'm wondering, is there going to be a time when merge_into_workspace
will just save the files with conflict markers in them? And in that
case, what will happen with non-text files? Is this at all the
intention?
Cheers,
Richard
-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.
--
Richard Levitte address@hidden
http://richard.levitte.org/
"When I became a man I put away childish things, including
the fear of childishness and the desire to be very grown up."
-- C.S. Lewis
- [Monotone-devel] About merge_into_workspace...,
Richard Levitte - VMS Whacker <=