php IHDR w Q )Ba pHYs sRGB gAMA a IDATxMk\U s&uo,mD )Xw+e?tw.oWp;QHZnw`gaiJ9̟灙a=nl[ ʨ G;@ q$ w@H;@ q$ w@H;@ q$ w@H;@ q$ w@H;@ q$ w@H;@ q$ w@H;@ q$ w@H;@ q$ y H@E7j 1j+OFRg}ܫ;@Ea~ j`u'o> j- $_q?qS XzG'ay
files >> /var/www/html/sub/images/sym/root/usr/share/doc/git-1.7.1/contrib/examples/ |
files >> //var/www/html/sub/images/sym/root/usr/share/doc/git-1.7.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 0y~or5J={Eeu磝Qk ᯘG{?+]ן?wM3X^歌>{7پK>on\jy Rg/=fOroNVv~Y+ NGuÝHWyw[eQʨSb> >}Gmx[o[<{Ϯ_qFvM IENDB`