Add TODO about testing various merge error scenarios.
Add TODO about testing various merge error scenarios.

c4pt0r/cockroach,ajayaa/cockroach,iqstack/cockroach,GokulSrinivas/cockroach,freakynit/cockroach,vaibhavarora/cockroach,glycerine/cockroach,alex/cockroach,vaibhavarora/cockroach,alunarbeach/cockroach,ajayaa/cockroach,Kevin-GuanJian/cockroach,nkhuyu/cockroach,jmank88/cockroach,ajayaa/cockroach,paperstreet/cockroach,briceburg/cockroach,chrisseto/cockroach,alex/cockroach,veteranlu/cockroach,XuWanHong/cockroach-1,jamesgraves/cockroach,maxlang/cockroach,petermattis/cockroach,nkhuyu/cockroach,XuWanHong/cockroach-1,SustainFund/cockroach,Kevin-GuanJian/cockroach,nkhuyu/cockroach,hassyma/cockroach,jess-edwards/cockroach,yosiat/cockroach,il9ue/cockroach,XuWanHong/cockroach-1,marcuswestin/cockroach,ngaut/cockroach,slavau/cockroach,Kevin-GuanJian/cockroach,briceburg/cockroach,loucash/cockroach,linearb/cockroach,briceburg/cockroach,XuWanHong/cockroach-1,cuongdo/cockroach,nieyy/cockroach,alunarbeach/cockroach,GokulSrinivas/cockroach,yananzhi/cockroach,vivekmenezes/cockroach,cockroachdb/cockroach,yosiat/cockroach,yosiat/cockroach,chrisseto/cockroach,Kevin-GuanJian/cockroach,marcuswestin/cockroach,veteranlu/cockroach,alex/cockroach,es-chow/cockroach,jmank88/cockroach,chrisseto/cockroach,jgautheron/cockroach,freakynit/cockroach,jmank88/cockroach,linearb/cockroach,petermattis/cockroach,freakynit/cockroach,abhishekgahlot/cockroach,ajayaa/cockroach,chrisseto/cockroach,SustainFund/cockroach,veteranlu/cockroach,veteranlu/cockroach,bg451/cockroach,alunarbeach/cockroach,loucash/cockroach,mbertschler/cockroach,Kevin-GuanJian/cockroach,linearb/cockroach,iqstack/cockroach,arjun4084346/cockroach,glycerine/cockroach,jgautheron/cockroach,maxlang/cockroach,maxlang/cockroach,paperstreet/cockroach,mbonaci/cockroach,loucash/cockroach,arjun4084346/cockroach,GokulSrinivas/cockroach,arypurnomoz/cockroach,cockroachdb/cockroach,loucash/cockroach,fengshao0907/cockroach,iqstack/cockroach,slavau/cockroach,marcuswestin/cockroach,cockroachdb/cockroach,hassyma/cockroach,cuongdo/cockroach,nieyy/cockroach,veteranlu/cockroach,vaibhavarora/cockroach,nieyy/cockroach,loucash/cockroach,jess-edwards/cockroach,petermattis/cockroach,arypurnomoz/cockroach,fengshao0907/cockroach,yananzhi/cockroach,Abioy/cockroach,marcuswestin/cockroach,cuongdo/cockroach,marcuswestin/cockroach,veteranlu/cockroach,ajayaa/cockroach,bg451/cockroach,yosiat/cockroach,il9ue/cockroach,yananzhi/cockroach,yananzhi/cockroach,c4pt0r/cockroach,yiixiansheng/cockroach,yosiat/cockroach,fengshao0907/cockroach,nkhuyu/cockroach,arypurnomoz/cockroach,arjun4084346/cockroach,veteranlu/cockroach,domluna/cockroach,fengshao0907/cockroach,vivekmenezes/cockroach,es-chow/cockroach,XisiHuang/cockroach,cockroachdb/cockroach,nieyy/cockroach,domluna/cockroach,maxlang/cockroach,nieyy/cockroach,hassyma/cockroach,hassyma/cockroach,vivekmenezes/cockroach,linearb/cockroach,vivekmenezes/cockroach,jess-edwards/cockroach,il9ue/cockroach,XuWanHong/cockroach-1,marcuswestin/cockroach,hassyma/cockroach,ngaut/cockroach,SustainFund/cockroach,paperstreet/cockroach,jess-edwards/cockroach,petermattis/cockroach,alunarbeach/cockroach,domluna/cockroach,fengshao0907/cockroach,bg451/cockroach,yiixiansheng/cockroach,petermattis/cockroach,briceburg/cockroach,marcuswestin/cockroach,cockroachdb/cockroach,il9ue/cockroach,slavau/cockroach,GokulSrinivas/cockroach,nkhuyu/cockroach,jamesgraves/cockroach,c4pt0r/cockroach,maxlang/cockroach,Abioy/cockroach,jgautheron/cockroach,abhishekgahlot/cockroach,jgautheron/cockroach,petermattis/cockroach,hassyma/cockroach,XisiHuang/cockroach,cuongdo/cockroach,paperstreet/cockroach,bg451/cockroach,petermattis/cockroach,bg451/cockroach,domluna/cockroach,linearb/cockroach,jamesgraves/cockroach,abhishekgahlot/cockroach,jess-edwards/cockroach,sunya123/cockroach,alex/cockroach,abhishekgahlot/cockroach,sunya123/cockroach,glycerine/cockroach,yananzhi/cockroach,marcuswestin/cockroach,jamesgraves/cockroach,jgautheron/cockroach,arjun4084346/cockroach,sunya123/cockroach,mbonaci/cockroach,vivekmenezes/cockroach,XisiHuang/cockroach,il9ue/cockroach,cuongdo/cockroach,glycerine/cockroach,jmank88/cockroach,domluna/cockroach,Kevin-GuanJian/cockroach,SustainFund/cockroach,mbonaci/cockroach,domluna/cockroach,paperstreet/cockroach,es-chow/cockroach,cuongdo/cockroach,yiixiansheng/cockroach,nieyy/cockroach,ngaut/cockroach,nieyy/cockroach,iqstack/cockroach,briceburg/cockroach,SustainFund/cockroach,chrisseto/cockroach,mbertschler/cockroach,briceburg/cockroach,chrisseto/cockroach,arjun4084346/cockroach,XisiHuang/cockroach,vaibhavarora/cockroach,sunya123/cockroach,ngaut/cockroach,arypurnomoz/cockroach,jgautheron/cockroach,ngaut/cockroach,jmank88/cockroach,cockroachdb/cockroach,cockroachdb/cockroach,alex/cockroach,yiixiansheng/cockroach,XuWanHong/cockroach-1,Abioy/cockroach,linearb/cockroach,loucash/cockroach,cuongdo/cockroach,c4pt0r/cockroach,glycerine/cockroach,maxlang/cockroach,jmank88/cockroach,vivekmenezes/cockroach,il9ue/cockroach,c4pt0r/cockroach,XisiHuang/cockroach,sunya123/cockroach,GokulSrinivas/cockroach,SustainFund/cockroach,sunya123/cockroach,es-chow/cockroach,veteranlu/cockroach,arypurnomoz/cockroach,paperstreet/cockroach,mbonaci/cockroach,jamesgraves/cockroach,cuongdo/cockroach,jamesgraves/cockroach,vaibhavarora/cockroach,ngaut/cockroach,il9ue/cockroach,arypurnomoz/cockroach,Abioy/cockroach,mbertschler/cockroach,mbonaci/cockroach,arjun4084346/cockroach,yiixiansheng/cockroach,sunya123/cockroach,mbonaci/cockroach,jess-edwards/cockroach,vivekmenezes/cockroach,yiixiansheng/cockroach,nkhuyu/cockroach,XuWanHong/cockroach-1,maxlang/cockroach,freakynit/cockroach,c4pt0r/cockroach,vaibhavarora/cockroach,jmank88/cockroach,glycerine/cockroach,mbertschler/cockroach,Kevin-GuanJian/cockroach,paperstreet/cockroach,iqstack/cockroach,arjun4084346/cockroach,glycerine/cockroach,iqstack/cockroach,XisiHuang/cockroach,es-chow/cockroach,cockroachdb/cockroach,il9ue/cockroach,GokulSrinivas/cockroach,slavau/cockroach,abhishekgahlot/cockroach,bg451/cockroach,jess-edwards/cockroach,mbertschler/cockroach,ngaut/cockroach,alunarbeach/cockroach,bg451/cockroach,domluna/cockroach,iqstack/cockroach,sunya123/cockroach,es-chow/cockroach,maxlang/cockroach,mbertschler/cockroach,freakynit/cockroach,abhishekgahlot/cockroach,slavau/cockroach,fengshao0907/cockroach,alex/cockroach,yananzhi/cockroach,nieyy/cockroach,paperstreet/cockroach,arjun4084346/cockroach,mbertschler/cockroach,ajayaa/cockroach,glycerine/cockroach,freakynit/cockroach,yosiat/cockroach,vaibhavarora/cockroach,alunarbeach/cockroach,vaibhavarora/cockroach,yananzhi/cockroach,petermattis/cockroach,Abioy/cockroach,linearb/cockroach,slavau/cockroach,Abioy/cockroach,es-chow/cockroach,jamesgraves/cockroach,vivekmenezes/cockroach