summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:49:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-28 21:49:35 -0700
commit826603d11813e56452dca52c9509e7a3d6a9b900 (patch)
tree0f7c4054d330dbf86be0e258bd5c7eb29d3f2ab1 /t/t6037-merge-ours-theirs.sh
parentMerge branch 'nd/decorate-grafts' (diff)
downloadtgif-826603d11813e56452dca52c9509e7a3d6a9b900.tar.xz
Update draft release notes to 1.7.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions