summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-17 13:50:24 -0700
commit0a4ae91d1cf72b1185a46e5f072ac6b25b92350b (patch)
tree83469f2d205b980636228796adeed4b05aed8691 /git-merge-resolve.sh
parentMerge branch 'jk/interop-test' (diff)
parentblame: move blame_entry duplication to add_blame_entry() (diff)
downloadtgif-0a4ae91d1cf72b1185a46e5f072ac6b25b92350b.tar.xz
Merge branch 'rs/blame-code-cleanup'
Code clean-up. * rs/blame-code-cleanup: blame: move blame_entry duplication to add_blame_entry()
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions