summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
AgeCommit message (Expand)Author
2005-11-03git-merge-ours: make sure our index matches HEADJunio C Hamano
2005-11-03Add 'ours' merge strategy.Junio C Hamano