diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:40:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:40:09 -0700 |
| commit | 88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31 (patch) | |
| tree | b4550d79e5f34a8817ea787b299cabf8174c81c6 /wrapper.c | |
| parent | b46f7e54fcb2d01757d834d14dfd040b6892d695 (diff) | |
| parent | aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2 (diff) | |
| download | git-88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31.tar.gz git-88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31.tar.xz | |
Merge branch 'am/cherry-pick-rerere'
* am/cherry-pick-rerere:
Make cherry-pick use rerere for conflict resolution.
Diffstat (limited to 'wrapper.c')
0 files changed, 0 insertions, 0 deletions