Size: 454
Comment:
|
Size: 379
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 4: | Line 4: |
Extensions: * AliasExtension |
* TransplantExtension |
Line 9: | Line 7: |
* ImergeExtension * InotifyExtension * TransplantExtension |
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