Make cherry-pick use rerere for conflict resolution.
authorAbhijit Menon-Sen <ams@toroid.org>
Sun, 10 Aug 2008 11:48:55 +0000 (17:18 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2008 23:42:49 +0000 (16:42 -0700)
commitaa1a011...cc0e2a12c21ed05c88d8e9872fc166b2
tree2d16c93...8afe871dffedcf115c03d69b529d493bcopy hash to clipboard (tree)
parentac39efb...f3d41443c40166b7578b7fb87c2f3b60copy hash to clipboard (diff)
builtin-revert.c
t/t3504-cherry-pick-rerere.sh [new file with mode: 0755]