[Scilab-Dev] Bad merge 6.0.2 => master ?!

[Samuel Gougeon]

Hello,

With the master,

--> [v,o]=getversion()
  o  =
!VC++  x64  tk  release  Feb 15 2019  17:35:24  !
  v  =
  scilab-branch-master

I was trying to use the edit() feature 
<http://bugzilla.scilab.org/show_bug.cgi?id=15577>

--> edit linspace 45

merged in the master in May 2018, and already used in the master.
But it is no longer available!
Editing edit.sci shows that the feature has been overwritten with the 
former edit.sci version!

So, what happened ??

Samuel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.scilab.org/pipermail/dev/attachments/20190220/43711732/attachment.htm>