| Path : /proc/2/cwd/proc/3/task/3/cwd/usr/share/doc/git-1.8.3.1/contrib/examples/ |
| Current File : //proc/2/cwd/proc/3/task/3/cwd/usr/share/doc/git-1.8.3.1/contrib/examples/git-merge-ours.sh |
#!/bin/sh # # Copyright (c) 2005 Junio C Hamano # # Pretend we resolved the heads, but declare our tree trumps everybody else. # # We need to exit with 2 if the index does not match our HEAD tree, # because the current index is what we will be committing as the # merge result. git diff-index --quiet --cached HEAD -- || exit 2 exit 0