2 Commits (83b5d2f5b0c95fe102bc3d1cc2947abbdf5e5c5b)

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