diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-12-19 14:58:20 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-19 16:32:18 -0800 |
| commit | c6b4fa96cbb65036b36e19b4dd61c7030e457327 (patch) | |
| tree | bb926940434746ce4765654d37d6f6ee43d9b374 /builtin-show-branch.c | |
| parent | rerere: fix breakage of resolving. (diff) | |
| download | tgif-c6b4fa96cbb65036b36e19b4dd61c7030e457327.tar.xz | |
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>
Diffstat (limited to 'builtin-show-branch.c')
0 files changed, 0 insertions, 0 deletions