Reformatted excerpts from Hamish's message of 2011-02-20: > But I can't see why it could not find it. The code quoted above has > moved down by 31 lines, but is otherwise unchanged, but I thought git > could cope with that :/
Git apply is a pretty low-level command and I believe it acts basically like the patch command, i.e. fails fast if things aren't perfectly in tune. To pull in the git merge logic on patch files, use `git am -3`. > $ git am -s ../patches2merge/ > Nothing to do. I think it's trying to interpret that directory as a maildir. Give it the individual files. -- William <wmorgan-...@masanjin.net> _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel
