author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Thu, 21 Jun 2007 11:52:11 +0000 (12:52 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 23 Jun 2007 05:43:51 +0000 (22:43 -0700) | ||
commit | 0ce396431ee710aa406f7e41ad9578dcac54085f | |
tree | 76cf6597b637e6ea2afc0e923719cfc3d2de8d32 | tree | snapshot |
parent | 37cd4f7e820da82e5731c06b7ebf83963d796e5e | commit | diff |
diffcore-rename: favour identical basenames
When there are several candidates for a rename source, and one of them
has an identical basename to the rename target, take that one.
Noticed by Govind Salinas, posted by Shawn O. Pearce, partial patch
by Linus Torvalds.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When there are several candidates for a rename source, and one of them
has an identical basename to the rename target, take that one.
Noticed by Govind Salinas, posted by Shawn O. Pearce, partial patch
by Linus Torvalds.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-rename.c | diff | blob | history | |
t/t4001-diff-rename.sh | diff | blob | history |