···

       
44
       
 
       
          ff = "only";

     

       
45
       
 
       
          # Really only useful on a well-managed team. Maybe eventually.

     

       
46
       
 
       
          # verifySignatures = true;

     

       
0
       
 
       

     

       
47
       
 
       
        };

     

       
48
       
 
       


     

       
49
       
 
       
        push = {

     
···

       
87
       
 
       
        ui = {

     

       
88
       
 
       
          default-command = "log";

     

       
89
       
 
       
          show-cryptographic-signatures = true;

     

       
0
       
 
       

     

       
0
       
 
       

     

       
90
       
 
       
        };

     

       
91
       
 
       


     

       
92
       
 
       
        revset-aliases = {

     

       
93
       
 
       
          "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       
0
       
 
       

     

       
0
       
 
       

     

       
94
       
 
       
        };

     

       
95
       
 
       


     

       
96
       
 
       
        aliases = {

     

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

     

       
98
       
 
       
          e = ["edit"];

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
99
       
 
       
        };

     

       
100
       
 
       


     

       
101
       
 
       
        git = {

     
···

       
111
       
 
       
        };

     

       
112
       
 
       
      };

     

       
113
       
 
       
    };

     

       
0
       
 
       

     

       
0
       
 
       

     

       
114
       
 
       
  };

     

       
115
       
 
       
}

     

···

       
44
       
 
       
          ff = "only";

     

       
45
       
 
       
          # Really only useful on a well-managed team. Maybe eventually.

     

       
46
       
 
       
          # verifySignatures = true;

     

       
47
       
+
       
          conflictStyle = "diff3";

     

       
48
       
 
       
        };

     

       
49
       
 
       


     

       
50
       
 
       
        push = {

     
···

       
88
       
 
       
        ui = {

     

       
89
       
 
       
          default-command = "log";

     

       
90
       
 
       
          show-cryptographic-signatures = true;

     

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

     

       
92
       
+
       
          diff-formatter = "delta";

     

       
93
       
 
       
        };

     

       
94
       
 
       


     

       
95
       
 
       
        revset-aliases = {

     

       
96
       
 
       
          "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       
97
       
+
       
          "p(n)" = "p(@, n)";

     

       
98
       
+
       
          "p(r, n)" = "roots(r | ancestors(r-, n))";

     

       
99
       
 
       
        };

     

       
100
       
 
       


     

       
101
       
 
       
        aliases = {

     

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

     

       
103
       
 
       
          e = ["edit"];

     

       
104
       
+
       
          n = ["new"];

     

       
105
       
+
       
        };

     

       
106
       
+
       


     

       
107
       
+
       
        merge-tools.mergiraf = {

     

       
108
       
+
       
          program = "mergiraf";

     

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

     

       
110
       
 
       
        };

     

       
111
       
 
       


     

       
112
       
 
       
        git = {

     
···

       
122
       
 
       
        };

     

       
123
       
 
       
      };

     

       
124
       
 
       
    };

     

       
125
       
+
       


     

       
126
       
+
       
    programs.mergiraf.enable = true;

     

       
127
       
 
       
  };

     

       
128
       
 
       
}