?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Add 'ours' merge strategy.
[git/jrn.git] / git-merge-ours.sh
bloba64704f3e52be43b427792ef9c1bbe42af057c87
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Junio C Hamano
4 #
5 # Pretend we resolved the heads, but declare our tree trumps everybody else.
6 #
7 exit 0
Jonathan Nieder’s miscellaneous git branches