Pierre Habouzit <madcoder@xxxxxxxxxx> writes:
> + const char * const merge_advice =
> + _("use \"git reset --hard\" to abort, or resolve conflicts and commit");
I think that should be "git reset --merge" (which preserves files not
touched by the merge, and makes sure "git merge; git reset" doesn't
permanently loose data).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html