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
| File | Mode | Size |
|---|---|---|
| t-apply-1.expect | -rw-r--r-- | 544 bytes |
| t-apply-1.patch | -rw-r--r-- | 5.5 KB |
| t-apply-2.expect | -rw-r--r-- | 218 bytes |
| t-apply-2.patch | -rw-r--r-- | 1.9 KB |
| t-apply-3.expect | -rw-r--r-- | 317 bytes |
| t-apply-3.patch | -rw-r--r-- | 12.8 KB |
| t-apply-4.expect | -rw-r--r-- | 193 bytes |
| t-apply-4.patch | -rw-r--r-- | 245 bytes |
| t-apply-5.expect | -rw-r--r-- | 885 bytes |
| t-apply-5.patch | -rw-r--r-- | 12.7 KB |
| t-apply-6.expect | -rw-r--r-- | 232 bytes |
| t-apply-6.patch | -rw-r--r-- | 2.3 KB |
| t-apply-7.expect | -rw-r--r-- | 292 bytes |
| t-apply-7.patch | -rw-r--r-- | 12.0 KB |
Computing file changes ...
