summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-05-16 11:05:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-16 14:53:03 -0700
commit951b551d0f349f145f8606b946d64fc452ad6a51 (patch)
tree5468f637c2254d4e33b961f4eb115f93dad13993 /t/t6031-merge-recursive.sh
parentAlmost ready for 2.8.3 (diff)
downloadtgif-951b551d0f349f145f8606b946d64fc452ad6a51.tar.xz
difftool: initialize variables for readability
The code always goes into one of the two conditional blocks but make it clear that not doing so is an error condition by setting $ok to 0. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions