diff options
Diffstat (limited to 'git-merge-ours.sh')
| -rwxr-xr-x | git-merge-ours.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/git-merge-ours.sh b/git-merge-ours.sh new file mode 100755 index 0000000000..a64704f3e5 --- /dev/null +++ b/git-merge-ours.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +# Copyright (c) 2005 Junio C Hamano +# +# Pretend we resolved the heads, but declare our tree trumps everybody else. +# +exit 0 |