Update JGit to 2.3.1.201302201838-r.55-ge175daf
Update JGit to 2.3.1.201302201838-r.55-ge175daf

Includes a new experimental recursive merge strategy as well as
reworked merge base error handling.

Change-Id: I0feb5cd365fe939b9f7a6155f136ad65605036f0

hdost/gerrit,gerrit-review/gerrit,Team-OctOS/host_gerrit,gcoders/gerrit,netroby/gerrit,supriyantomaftuh/gerrit,MerritCR/merrit,thesamet/gerrit,bpollack/gerrit,midnightradio/gerrit,thesamet/gerrit,gerrit-review/gerrit,GerritCodeReview/gerrit,netroby/gerrit,Saulis/gerrit,gcoders/gerrit,dwhipstock/gerrit,WANdisco/gerrit,renchaorevee/gerrit,renchaorevee/gerrit,pkdevbox/gerrit,jackminicloud/test,joshuawilson/merrit,zommarin/gerrit,pkdevbox/gerrit,bootstraponline-archive/gerrit-mirror,dwhipstock/gerrit,bpollack/gerrit,ckamm/gerrit,Overruler/gerrit,WANdisco/gerrit,thesamet/gerrit,renchaorevee/gerrit,joshuawilson/merrit,netroby/gerrit,Team-OctOS/host_gerrit,MerritCR/merrit,renchaorevee/gerrit,supriyantomaftuh/gerrit,thinkernel/gerrit,dwhipstock/gerrit,thinkernel/gerrit,WANdisco/gerrit,gerrit-review/gerrit,anminhsu/gerrit,hdost/gerrit,netroby/gerrit,renchaorevee/gerrit,qtproject/qtqa-gerrit,dwhipstock/gerrit,pkdevbox/gerrit,GerritCodeReview/gerrit,joshuawilson/merrit,renchaorevee/gerrit,gracefullife/gerrit,supriyantomaftuh/gerrit,qtproject/qtqa-gerrit,gerrit-review/gerrit,TonyChai24/test,gracefullife/gerrit,qtproject/qtqa-gerrit,gracefullife/gerrit,gcoders/gerrit,Distrotech/gerrit,MerritCR/merrit,quyixia/gerrit,GerritCodeReview/gerrit,pkdevbox/gerrit,jackminicloud/test,Distrotech/gerrit,joshuawilson/merrit,jackminicloud/test,thinkernel/gerrit,ckamm/gerrit,Overruler/gerrit,bootstraponline-archive/gerrit-mirror,Seinlin/gerrit,WANdisco/gerrit,supriyantomaftuh/gerrit,MerritCR/merrit,GerritCodeReview/gerrit,bootstraponline-archive/gerrit-mirror,midnightradio/gerrit,zommarin/gerrit,basilgor/gerrit,basilgor/gerrit,WANdisco/gerrit,midnightradio/gerrit,WANdisco/gerrit,TonyChai24/test,Distrotech/gerrit,GerritCodeReview/gerrit,anminhsu/gerrit,anminhsu/gerrit,ckamm/gerrit,hdost/gerrit,hdost/gerrit,jackminicloud/test,hdost/gerrit,GerritCodeReview/gerrit,Saulis/gerrit,anminhsu/gerrit,Team-OctOS/host_gerrit,Overruler/gerrit,TonyChai24/test,quyixia/gerrit,Overruler/gerrit,GerritCodeReview/gerrit,Overruler/gerrit,thinkernel/gerrit,quyixia/gerrit,zommarin/gerrit,basilgor/gerrit,midnightradio/gerrit,Distrotech/gerrit,gcoders/gerrit,dwhipstock/gerrit,qtproject/qtqa-gerrit,jackminicloud/test,Seinlin/gerrit,Team-OctOS/host_gerrit,bootstraponline-archive/gerrit-mirror,qtproject/qtqa-gerrit,quyixia/gerrit,joshuawilson/merrit,bootstraponline-archive/gerrit-mirror,bpollack/gerrit,Team-OctOS/host_gerrit,TonyChai24/test,gerrit-review/gerrit,anminhsu/gerrit,thinkernel/gerrit,joshuawilson/merrit,thesamet/gerrit,anminhsu/gerrit,dwhipstock/gerrit,supriyantomaftuh/gerrit,quyixia/gerrit,Saulis/gerrit,basilgor/gerrit,ckamm/gerrit,thesamet/gerrit,Distrotech/gerrit,gerrit-review/gerrit,hdost/gerrit,pkdevbox/gerrit,GerritCodeReview/gerrit,TonyChai24/test,jackminicloud/test,hdost/gerrit,basilgor/gerrit,MerritCR/merrit,joshuawilson/merrit,Seinlin/gerrit,Distrotech/gerrit,MerritCR/merrit,bpollack/gerrit,Seinlin/gerrit,bpollack/gerrit,dwhipstock/gerrit,joshuawilson/merrit,quyixia/gerrit,ckamm/gerrit,bootstraponline-archive/gerrit-mirror,Seinlin/gerrit,Saulis/gerrit,Team-OctOS/host_gerrit,netroby/gerrit,WANdisco/gerrit,quyixia/gerrit,Team-OctOS/host_gerrit,Saulis/gerrit,Seinlin/gerrit,thesamet/gerrit,thinkernel/gerrit,gcoders/gerrit,thesamet/gerrit,pkdevbox/gerrit,gracefullife/gerrit,gracefullife/gerrit,gcoders/gerrit,Saulis/gerrit,supriyantomaftuh/gerrit,midnightradio/gerrit,midnightradio/gerrit,Distrotech/gerrit,jackminicloud/test,pkdevbox/gerrit,Overruler/gerrit,bpollack/gerrit,netroby/gerrit,gcoders/gerrit,qtproject/qtqa-gerrit,Seinlin/gerrit,thinkernel/gerrit,anminhsu/gerrit,netroby/gerrit,TonyChai24/test,gerrit-review/gerrit,MerritCR/merrit,renchaorevee/gerrit,TonyChai24/test,MerritCR/merrit,zommarin/gerrit,supriyantomaftuh/gerrit,qtproject/qtqa-gerrit,zommarin/gerrit