6 Commits (217542640ed219c980fff2b3c307c4520120f20f)

Author SHA1 Message Date
Junio C Hamano 1b1fdf8c2f read-tree --aggressive 19 years ago
Junio C Hamano 98efc8f3d8 octopus: allow manual resolve on the last round. 19 years ago
Junio C Hamano c884dd9a54 octopus: allow criss-cross and clarify the message when it rejects 19 years ago
Junio C Hamano d165fa14f0 define die() for scripts that use it. 19 years ago
Junio C Hamano 17cf939724 octopus: do not do AND'ed merge base. 19 years ago
Junio C Hamano 91063bbc6c Multi-backend merge driver. 20 years ago