[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0bdf518b1e862b814a61ab4c984e78f7afa8fc0d
Submitter: Hadriel Kaplan (hadrielk@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0bdf518 by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Try to debug merge test suite failure on windows buildbot
    
    This change will be undone once the problem is found.
    
    Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1
    Reviewed-on: https://code.wireshark.org/review/10136
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    

Actions performed:

    from  2c260fa   Use system's GeoIP database by default on Debian
    adds  0bdf518   Try to debug merge test suite failure on windows buildbot


Summary of changes:
 test/suite-mergecap.sh |   19 +++++++++++++------
 wiretap/merge.c        |   30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)