summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
blob: a64704f3e52be43b427792ef9c1bbe42af057c87 (plain)
1
2
3
4
5
6
7
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#
exit 0