![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Fri, 4 Aug 2006 16:21:41 +0000 (18:21 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 4 Aug 2006 18:30:35 +0000 (11:30 -0700) | ||
| commit | 3d234d0afacd355eb30b330a56bd2efa73bd44d5 | |
| tree | c5c37ecda8675bc1c8741a17b7abec07ab9c6bc0 | tree | snapshot |
| parent | c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9 | commit | diff |
merge-recursive: fix rename handling
To handle renames properly, we iterate through all file names of both
heads, the current one, and the one to be merged.
Only that there was a bug, where it was checked if the file name was present
in both heads, but the result of the check was never used. Instead, the
merge proceeded as if both heads contained that file.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
To handle renames properly, we iterate through all file names of both
heads, the current one, and the one to be merged.
Only that there was a bug, where it was checked if the file name was present
in both heads, but the result of the check was never used. Instead, the
merge proceeded as if both heads contained that file.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diff | blob | history |