| Version | Not specified |
| Branch | lp:bzr-extmerge |
| Home page | https://launchpad.net/bzr-extmerge |
| Owner | zindar |
| GNU/Linux | Yes |
| Windows | Yes |
| Mac OS X | Yes |
external merge plugin for bzr
Purpose
Calls an external merge program such as meld, xxdiff, kdiff3, opendiff,
Usage
bzr extmerge [FILE...]
Options
| --usage | Show usage message and options. |
| --all | Use all files with conflicts. |
| -v, --verbose | Display more information. |
| -q, --quiet | Only display errors and warnings. |
| -h, --help | Show help message. |
Description
Beyond Compare, etc to help you resolve any conflicts you have.
Will call a user defined merge tool if it exists, otherwise, will try bcompare, kdiff3, xxdiff, meld and opendiff, in that order.
To define your own merge tool, set external_merge in bazaar.conf. See extmerge/extmerge.py for the syntax.
Aliases
emerge
Home