Differences between revisions 11 and 17 (spanning 6 versions)
⇤ ← Revision 11 as of 2007-08-08 03:01:35 →
Size: 454
Editor: 220
Comment:
← Revision 17 as of 2007-08-08 03:22:21 → ⇥
Size: 262
Editor: 220
Comment:
Deletions are marked like this. Additions are marked like this.
Line 4: Line 4:

Extensions:
 * AliasExtension
 * DigestExtension
 * HgciaExtension
 * ImergeExtension
 * InotifyExtension
Line 17: Line 10:
 * automatic resolution of previously handled merge conflicts, cf git-rerere

Projects:

Todo:

  • Mq: add a qrebase command to wrap qsave -e c; qpush -a -m
  • Transplant: Support merge transplants. Use original second parent?
  • Hunk selection (waiting on mpatch merge)

BrendanCully (last edited 2012-11-06 08:56:23 by mpm)