summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-17 20:50:24 (GMT)
commit0a4ae91d1cf72b1185a46e5f072ac6b25b92350b (patch)
tree83469f2d205b980636228796adeed4b05aed8691 /builtin/merge.c
parent0bb80ab090fadc99d3d19d23209ddfb7e4f54b3d (diff)
parentdfa3ad32386f95ae954d65163152f8130e3586a3 (diff)
downloadgit-0a4ae91d1cf72b1185a46e5f072ac6b25b92350b.zip
git-0a4ae91d1cf72b1185a46e5f072ac6b25b92350b.tar.gz
git-0a4ae91d1cf72b1185a46e5f072ac6b25b92350b.tar.bz2
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions