aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-30 17:17:41 -0800
committerJunio C Hamano <junkio@cox.net>2006-10-30 17:17:41 -0800
commitf69e743d97cdb3f6647ea0620a22311e7bf36051 (patch)
treeec77a161ca08db652ddead00df9cda210f09e2d4 /diff.h
parentae86ad65757b857337f10f25ff31cb3348d3943d (diff)
downloadgit-f69e743d97cdb3f6647ea0620a22311e7bf36051.tar.xz
git-pickaxe: split find_origin() into find_rename() and find_origin().
When a merge adds a new file from the second parent, the earlier code tried to find renames in the first parent before noticing that the vertion from the second parent was added without modification. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions