diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:01:14 -0800 |
| commit | 7010146f90abf0e4954690f6cd38a8463786fec7 (patch) | |
| tree | 2ea131c2e7a1f2b6042f847dad79bdf4a431f1b2 /t/t3507-cherry-pick-conflict.sh | |
| parent | 87a23e77c6ffc5713eff3a4a4da036731da2dc3f (diff) | |
| parent | 043a4492b3b7da6496617201c369cff6ab7c26f2 (diff) | |
| download | git-7010146f90abf0e4954690f6cd38a8463786fec7.tar.gz | |
Merge branch 'rr/sequencer'
* rr/sequencer:
sequencer: factor code out of revert builtin
revert: prepare to move replay_action to header
Conflicts:
builtin/revert.c
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions