Incorporated comments on the previous patches, and one new patch addressing a problem I spotted while testing git-merge-one-file.
I couldn't figure out how to use git diff to achieve the effect of the external diff here - we'd need some alternative to achieve what it does with the -L option, and I failed to come up with anything remotely elegant. Kevin Bracey (3): mergetools/p4merge: swap LOCAL and REMOTE mergetools/p4merge: create a base if none available git-merge-one-file: revise merge error reporting git-merge-one-file.sh | 38 ++++++++++++-------------------------- git-sh-setup.sh | 13 +++++++++++++ mergetools/p4merge | 8 ++++++-- 3 files changed, 31 insertions(+), 28 deletions(-) -- 1.8.2.rc3.7.g77aeedb -- 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
