···

       
105
       
 
       
          n = ["new"];

     

       
106
       
 
       
          tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       
107
       
 
       
          tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];

     

       
0
       
 
       

     

       
108
       
 
       
        };

     

       
109
       
 
       


     

       
110
       
 
       
        merge-tools.mergiraf = {

     

···

       
105
       
 
       
          n = ["new"];

     

       
106
       
 
       
          tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       
107
       
 
       
          tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];

     

       
108
       
+
       
          solve = ["resolve" "--tool" "mergiraf"];

     

       
109
       
 
       
        };

     

       
110
       
 
       


     

       
111
       
 
       
        merge-tools.mergiraf = {