Mode | Name | Size | |
---|---|---|---|
-rw-r--r-- | commit.go | 409 | logplain |
d--------- | commit | 336 | logplain |
d--------- | conflicts | 85 | logplain |
-rw-r--r-- | main.go | 1183 | logplain |
-rw-r--r-- | main_test.go | 282 | logplain |
-rw-r--r-- | merge.go | 1944 | logplain |
-rw-r--r-- | merge_test.go | 6368 | logplain |
-rw-r--r-- | resolve_conflicts.go | 5281 | logplain |
-rw-r--r-- | revert.go | 1736 | logplain |
-rw-r--r-- | revert_test.go | 6367 | logplain |
d--------- | testhelper | 41 | logplain |
-rw-r--r-- | util.go | 598 | logplain |