diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-09-13 23:39:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-13 15:45:23 -0700 |
| commit | d9a23fa6f7124befe7803f5f3a8c53999578caa4 (patch) | |
| tree | 6c8855b99470b0d36c409d89772d1c0f55878191 /gitMergeCommon.py | |
| parent | [PATCH] Define relative .git/objects/info/alternates semantics. (diff) | |
| download | git-d9a23fa6f7124befe7803f5f3a8c53999578caa4.tar.gz git-d9a23fa6f7124befe7803f5f3a8c53999578caa4.zip | |
[PATCH] Be more like the 'resolve' strategy.
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>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions