···

       
90
       
 
       
          show-cryptographic-signatures = true;

     

       
91
       
 
       
          conflict-marker-style = "git";

     

       
92
       
 
       
          diff-formatter = "delta";

     

       
0
       
 
       

     

       
0
       
 
       

     

       
93
       
 
       
        };

     

       
94
       
 
       


     

       
95
       
 
       
        revset-aliases = {

     
···

       
108
       
 
       
        merge-tools.mergiraf = {

     

       
109
       
 
       
          program = "mergiraf";

     

       
110
       
 
       
          merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];

     

       
0
       
 
       

     

       
0
       
 
       

     

       
111
       
 
       
        };

     

       
112
       
 
       


     

       
113
       
 
       
        git = {

     

···

       
90
       
 
       
          show-cryptographic-signatures = true;

     

       
91
       
 
       
          conflict-marker-style = "git";

     

       
92
       
 
       
          diff-formatter = "delta";

     

       
93
       
+
       
          editor = "codium -w";

     

       
94
       
+
       
          merge-editor = "vscodium";

     

       
95
       
 
       
        };

     

       
96
       
 
       


     

       
97
       
 
       
        revset-aliases = {

     
···

       
110
       
 
       
        merge-tools.mergiraf = {

     

       
111
       
 
       
          program = "mergiraf";

     

       
112
       
 
       
          merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];

     

       
113
       
+
       
          merge-conflict-exit-codes = [1];

     

       
114
       
+
       
          conflict-marker-style = "git";

     

       
115
       
 
       
        };

     

       
116
       
 
       


     

       
117
       
 
       
        git = {