summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:31:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-20 13:53:26 -0700
commite80e85a52adfda053cafc3b23058a86aff35404f (patch)
treeafd02e8830a8d41398d0d77983ae7783e0382b39 /git-merge-resolve.sh
parentMerge branch 'mg/log-decorate-HEAD' (diff)
downloadtgif-e80e85a52adfda053cafc3b23058a86aff35404f.tar.xz
Post 2.3 cycle (batch #11)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions