|
⇤ ← Revision 1 as of 2010-01-20 07:07:30
Size: 844
Comment:
|
Size: 845
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| == Collapse Extension == | == MergeUtil Extension == |
MergeUtil Extension
This extension is not distributed with Mercurial.
Author: Colin Caughie <c.caughie@indigovision.com>
Repository: http://bitbucket.org/ccaughie/mergeutil
Overview
This extension provides utilities that can be useful when merging two branches in a Mercurial repository. In particular, when a merge is in progress (i.e. the current working directory has two parents) it defines shortcuts to the three most important historical revisions:
- local: The parent on the local branch
- other: The parent on the other branch
- base: The common ancestor of local and other
This lets you do things like::
$ hg diff -r other foo.py $ hg diff -r base -r local foo.py
It also provides the mergeinfo command, which displays useful information about the ongoing merge.