2013/6/24 SZEDER Gábor <sze...@ira.uka.de>: > This patch series will conflict with Eduardo's work on refactoring the > colorizing function, and the conflict is not trivial. Although there > are still some open questions left with that series (using tput, zsh > tests), those won't affect the conflicts between the two patch series. > So, for the convenience of our maintainer, I picked up Eduardo's > series, took the liberty to apply a fixup commit on top with my > suggestions from [2], merged the two series, and published the result > at: > > https://github.com/szeder/git.git > bash-prompt-speedup-and-color-refactorization > > Eduardo, could you please also check that my conflict resolution is > correct? Thanks.
Gábor, the conflict resolution is quite correct. Thanks, Eduardo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
