Differences between revisions 2 and 14 (spanning 12 versions)
⇤ ← Revision 2 as of 2007-06-07 06:28:55 →
Size: 262
Editor: BrendanCully
Comment:
← Revision 14 as of 2007-08-08 03:03:03 → ⇥
Size: 340
Editor: 220
Comment:
Deletions are marked like this. Additions are marked like this.
Line 10: 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)
  • automatic resolution of previously handled merge conflicts, cf git-rerere

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