summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jay Soffian <jaysoffian@gmail.com>2010-04-19 18:08:31 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-19 22:19:30 -0700
commitd4785cd11dd0a55e30a1185a96910f0e57b6049a (patch)
treec1dbf4414887ab1838d9460c4ba5a8eba4770d4e /Documentation/git-merge-file.txt
parentreceive-pack: detect aliased updates which can occur with symrefs (diff)
downloadtgif-d4785cd11dd0a55e30a1185a96910f0e57b6049a.tar.xz
t5516-fetch-push.sh: style cleanup
Cleanup t5516-fetch-push.sh to use prevailing test script style Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions