If you have
vim installed (like I do), use it to smash the line endings into the non-conflicted form.
__________________
Zaiband: end the "I shouldn't have survived that" experience. V3.0.6 fork on
Hg.
Zaiband 3.0.10
ETA Mar. 7 2011 (Yes, schedule slipped. Latest testing indicates not enough assert() calls to allow release.)
Z.C++: pre-alpha C/C++ compiler system (usable preprocessor). Also on
Hg. Z.C++ 0.0.10
ETA December 31 2011