bzr bazaar graphical merge (kdiff3)

Um mit Bazaar unter Windows ein Merge-Tool zu benutzen:

install extmerge plugin:
bzr branch lp:bzr-extmerge extmerge

merge plugin config

C:\Programme\KDiff3\kdiff3.exe %t %o  -o %r -b %b -m -L1 BASE -L2 local-version -L3 server-version

merge
>bzr emerge readme.txt
>bzr resolved readme.txt
>bzr commit


Kommentare

Beliebte Posts aus diesem Blog

Powershell snippet to send messages to telegram

using the birt runtime with spring boot and gradle to generate PDF from a Report Design File