717   o  0: 4a2df7238c3b 'A'

   717   o  0: 4a2df7238c3b 'A'

   718   

   718   

   719   $ cat A

   719   $ cat A

   720   <<<<<<< dest:   82b8abf9c185 D - test: D

   720   <<<<<<< dest:   82b8abf9c185 D - test: D

   721   D

   721   D

   723   A

   723   A

   724   =======

   724   =======

   725   B

   725   B

   726   >>>>>>> source: f899f3910ce7 B - test: B

   726   >>>>>>> source: f899f3910ce7 B - test: B

   727   $ echo BC > A

   727   $ echo BC > A

   745   o  0: 4a2df7238c3b 'A'

   745   o  0: 4a2df7238c3b 'A'

   746   

   746   

   747   $ cat A

   747   $ cat A

   748   <<<<<<< dest:   82b8abf9c185 D - test: D

   748   <<<<<<< dest:   82b8abf9c185 D - test: D

   749   BC

   749   BC

   751   B

   751   B

   752   =======

   752   =======

   753   C

   753   C

   754   >>>>>>> source: 63668d570d21 C tip - test: C

   754   >>>>>>> source: 63668d570d21 C tip - test: C

   755   $ echo BD > A

   755   $ echo BD > A