diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-22 23:26:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:07:27 -0800 |
| commit | 4c371f91270792791f867d15f25b03f800ab35a1 (patch) | |
| tree | 8ca2bd7efa1e7801039ed90faeb13706d235b492 /xdiff/xutils.c | |
| parent | GIT 1.6.5 (diff) | |
| download | tgif-4c371f91270792791f867d15f25b03f800ab35a1.tar.xz | |
merge-recursive: point the user to commit when file would be overwritten.
The commit-before-pull is well accepted in the DVCS community, but is
confusing some new users. This should get them back in the right way when
the problem occurs.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xutils.c')
0 files changed, 0 insertions, 0 deletions