3-way merge !

    hi


    I'm using fc3


    when I tried

    Zitat

    monotone update


    I got this error


    Zitat

    No external 3-way merge command found.
    You may want to check that $EDITOR is set to an editor that supports 3-way merge,
    set this explicitly in your get_preferred_merge3_command hook,
    or add a 3-way merge program to your path.


    any help please ...


    thanks ...

    Zitat

    Original von tmbinc
    otherwise install for example "meld", then you can merge your changes.



    Hi tmbinc,
    Do you know a working console based version for the 3-way merge?



    greetings - Katobuggy

    Zitat

    Originally posted by katobuggy
    Hi tmbinc,
    Do you know a working console based version for the 3-way merge?


    Sorry, I'm a bit late. You can use GNU diff3 to do 3-way merge in console. It's in the "diff" package on Debian. On the graphical side, for GTK you can use Meld and for KDE you can use Kompare.