2 Commits (75025ccdb79b5d6b290c630f8777c9f7bb9d257c)

Author SHA1 Message Date
Junio C Hamano 160252f816 git-merge-ours: make sure our index matches HEAD 20 years ago
Junio C Hamano 64da9e604e Add 'ours' merge strategy. 20 years ago