diff options
| author |  Frank Lichtenheld <frank@lichtenheld.de> | 2007-03-06 10:42:24 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-03-11 22:49:08 -0700 |
| commit | 538778469ca267c8888bc659d20680c3a1e077fd (patch) | |
| tree | e1ee911b54b5e22ec508e58f433317d1d53ae735 /diffcore-break.c | |
| parent | I like the idea of the new ':/<oneline prefix>' notation, and gave it (diff) | |
| download | tgif-538778469ca267c8888bc659d20680c3a1e077fd.tar.xz | |
cvsserver: Use Merged response instead of Update-existing for merged files
Using Update-existing leads to the client forgetting about the "locally
modified" status of the file which can lead to loss of local changes on
later updates.
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions