|
Size: 832
Comment:
|
Size: 831
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 7: | Line 7: |
| Download site: [http://hg.kublai.com/mercurial/extensions/imerge | Download site: http://hg.kublai.com/mercurial/extensions/imerge |
Imerge Extension
This extension is not distributed with Mercurial.
Author: Brendan Cully
Download site: http://hg.kublai.com/mercurial/extensions/imerge
Overview
imerge lets you split a merge into pieces. When you start a merge with imerge, the names of all files with conflicts are recorded. The following subcommands are available:
- imerge status: show the current state of the merge
- imerge next: show the next unresolved file merge
imerge merge <file>: merge <file>
imerge resolve <file>...: mark files as successfully merged
imerge unresolve <file>...: mark files as requiring merging.
Configuration
Configure your .hgrc to enable the extension by adding following lines:
[extensions] imerge=/path/to/imerge.py