> This looks to me like no merge will happen if --no-prompt/-y or > mergetool.prompt is set to false. Have you tested with this option or > have I misread? sorry haven't tested as I don't use that. will test in the morning... if it doesn't work will try to get it working. > Also, I think you've lost some tabs. Mergetool does have some > inconsistent tabbing but they way I've been aiming towards (which > matches most, but not all of git-mergetool.sh) is to use tabs == 8 > spaces for indents but to indent each level by 4 spaces. e.g. three > levels of indent is one tab plus four spaces. thanks wasn't sure on the indentation, I set tabstop to 4 spaces in vim so my tabs look like your spaces. I'll correct in the next case. > It might be quite nice to offer the option of directly using an 'ours' > or 'theirs' as an alternative to skip for binary files. A bit like > symlinks are handled in mergetool. I could look into it... at the same time I don't have a good test case so I'd rather leave it to someone else. > I'd like to keep (additionally) the behaviour, that the merge starts > with just pressing <Enter>. Because what you mostly want to do, when > using git-mergetool, is actually merging. I'd thought of that... and I'll see what I can do, although to me it doesn't matter much. > This doesn't seem right. erm.. yeah... I'll fix it -- Caleb Cushing http://xenoterracide.blogspot.com -- 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
