OSDN Git Service
(root)
/
git-core
/
git.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Add 'ours' merge strategy.
[git-core/git.git]
/
git-merge-ours.sh
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