[issue2235] default behaviour of update shoul not be merge

[Peter Arrenbrecht]

On Sat, Jun 12, 2010 at 2:20 PM, Sune Foldager <cryo at cyanite.org> wrote:
> On 2010-06-12 14:10, Gabor Szelei wrote:
>>
>> New submission from Gabor Szelei<gabor.szelei at birdstep.com>:
>>
>> Update should not merge uncommitted changes as default.
>> If merge fails uncommitted changes would be lost.
>> update should behave like update -c by default.
>
> Uncommitted changes aren't lost, as the original files are saved (with .orig
> suffix). Still, it might be worth discussing if we should rather assume -c
> by default and have an -m option.

+1
-parren