[tools] testbot/WineRunReconfig: Use rebase when updating the TestBot source.

[Francois Gouget]

The TestBot source should be unmodified so there should be no
difference between 'git merge' and 'git rebase'. If there are local
patches (for debugging?) rebase will keep them more visible.

Signed-off-by: Francois Gouget 
---
This avoids a git warning.

testbot/bin/WineRunReconfig.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 9bd9429930..c91966d385 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -362,7 +362,7 @@ if ($Step->FileType ne "none")
 my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl";
 $Script = "#!/bin/sh\n".
           "( set -x\n".
-          "  git pull &&\n".
+          "  git pull --rebase &&\n".
           "  ../bin/build/$Script ". ShQuote(MergeMissionStatementTasks($Task->Missions)) ."\n".
           ") >Reconfig.log 2>&1\n";
 my $TA = $VM->GetAgent();