diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-08-19 21:50:05 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-26 13:35:31 -0700 |
| commit | b4fd94064de5cec7a45883684225b600d36208d9 (patch) | |
| tree | ab819d087dff67eb99cde8d9cd63a55266cabeb6 /t/t3507-cherry-pick-conflict.sh | |
| parent | commit: reduce use of redundant global variables (diff) | |
| download | tgif-b4fd94064de5cec7a45883684225b600d36208d9.tar.xz | |
merge: keep stash[] a local variable
A stash is created by save_state() and used by restore_state(). Pass
SHA-1 explicitly for clarity and keep stash[] to cmd_merge().
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions