summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-18 11:53:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-18 11:53:17 -0800
commitf3f407747c1cce420ae4b4857c4a6806efe38680 (patch)
treea2623795f93ff0b6a6442cbecc19b9cbe4b5a974 /git-merge-resolve.sh
parentMerge branch 'jc/push-cert' (diff)
downloadtgif-f3f407747c1cce420ae4b4857c4a6806efe38680.tar.xz
Post 2.3 cycle (batch #3)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions