![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Wed, 25 Apr 2007 20:06:59 +0000 (22:06 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 26 Apr 2007 06:43:16 +0000 (23:43 -0700) | ||
| commit | c135ee88f8584996ead993c76015d2c03798ab9e | |
| tree | 704d7f2fdac1166a25d5ab8ed73384cee7280f54 | tree | snapshot |
| parent | 6169a89c4fd29cf9c747bab7bd310877328bc7e2 | commit | diff |
Avoid excessive rewrites in merge-recursive
If a file is changed in one branch, and renamed and changed to the
same content in another branch than we can skip the rewrite of this
file in the working directory, as the content does not change.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
If a file is changed in one branch, and renamed and changed to the
same content in another branch than we can skip the rewrite of this
file in the working directory, as the content does not change.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diff | blob | history |