Revision d9a23fa6f7124befe7803f5f3a8c53999578caa4 authored by Fredrik Kuivinen on 13 September 2005, 21:39:34 UTC, committed by Junio C Hamano on 13 September 2005, 22:45:23 UTC
If there are non-mergeable changes leave the head contents in the cache and update the working directory with the output from merge(1). In the add/add and delete/modify conflict cases leave unmerged cache entries in the index. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent ccfd3e9
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...