summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:21:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 22:21:30 -0800
commitead8eb8c1092ce2d94d70872946829a7a946ae9d (patch)
treeb385824ee4644831652e9f4f98d65ef395dcb1dd /t/t6037-merge-ours-theirs.sh
parentMerge branch 'cn/maint-branch-with-bad' into maint (diff)
downloadtgif-ead8eb8c1092ce2d94d70872946829a7a946ae9d.tar.xz
Update draft release notes to 1.7.9.3 for the last time
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