[PATCH v2 5/5] Add a few more code comments and blank lines in guess_merge_tool

[Sebastian Schuberth]

Signed-off-by: Sebastian Schuberth <sschube...@gmail.com>
---
 git-mergetool--lib.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index ed630b2..ac9a8f0 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -112,14 +112,17 @@ run_merge_tool () {
 }
 
 guess_merge_tool () {
+       # Add tools that can either do merging or diffing, but not both.
        if merge_mode
        then
                tools="tortoisemerge"
        else
                tools="kompare"
        fi
+
        if test -n "$DISPLAY"
        then
+               # Prefer GTK-based tools under Gnome.
                if test -n "$GNOME_DESKTOP_SESSION_ID"
                then
                        tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
@@ -128,6 +131,8 @@ guess_merge_tool () {
                fi
                tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3"
        fi
+
+       # Prefer vimdiff if vim is the default editor.
        case "${VISUAL:-$EDITOR}" in
        *vim*)
                tools="$tools vimdiff emerge"
@@ -136,6 +141,7 @@ guess_merge_tool () {
                tools="$tools emerge vimdiff"
                ;;
        esac
+
        echo >&2 "merge tool candidates: $tools"
 
        # Loop over each candidate and stop when a valid merge tool is found.
-- 
1.7.11.msysgit.2


--
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