Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

diff.tool or merge.tool should not be required when using --extcmd #25

Open
revane opened this issue Feb 8, 2013 · 0 comments
Open

Comments

@revane
Copy link

revane commented Feb 8, 2013

diff.tool or merge.tool is only necessary if using git-mergetool--lib to execute a merge tool. If you're running an external command this information is not required. I suggest changing the logic to test for presence of diff.tool or merge.tool only once args are parsed and --extcmd is not present.

If diff.tool is not present you get an annoying message from get_merge_tool(). This could be avoided if we only call this function if --extcmd is not present.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant