Linus Torvalds wrote: > Keep the complaints coming when something doesn't work the way it should. > I'll continue to try to blame your incompetence as much as I humanly can, > but hey, some of it is occasionally mine too... ;( Well, since it's obviously complaint time :-) git-resolve-script still seems a bit too eager to write MERGE_HEAD and ORIG_HEAD - they only make sense if there's actually been any merging done, don't they? Patch below shows what I mean. /dan --- [PATCH] Make git-resolve-script less eager to write MERGE_HEAD MERGE_HEAD and ORIG_HEAD should only be written if there's actually been any merging done. Signed-off-by: Dan Holmsand