![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:19 +0000 (20:37 -0700) |
* jk/cherry-pick-root-with-resolve:
t3503: test cherry picking and reverting root commits
revert: allow reverting a root commit
cherry-pick: handle root commits with external strategies
t3503: test cherry picking and reverting root commits
revert: allow reverting a root commit
cherry-pick: handle root commits with external strategies
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge