![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eric Wong <normalperson@yhbt.net> | |
| Tue, 19 Dec 2006 22:58:20 +0000 (14:58 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 20 Dec 2006 00:32:18 +0000 (16:32 -0800) | ||
| commit | c6b4fa96cbb65036b36e19b4dd61c7030e457327 | |
| tree | bb926940434746ce4765654d37d6f6ee43d9b374 | tree | snapshot |
| parent | 8336afa563fbeff35e531396273065161181f04c | commit | diff |
git-cvsserver: fix breakage when calling git merge-file
In the same vein as 8336afa563fbeff35e531396273065161181f04c,
this fixes the the RCS merge to git-merge-file conversion in
commit e2b70087.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
In the same vein as 8336afa563fbeff35e531396273065161181f04c,
this fixes the the RCS merge to git-merge-file conversion in
commit e2b70087.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-cvsserver.perl | diff | blob | history |