tokkee.org
Code
projects
/
git.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
a64704f3e52be43b427792ef9c1bbe42af057c87
[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