git-gui: stop using deprecated merge syntax

diff --git a/git-gui.sh b/git-gui.sh
index 0e4b05aa1417ea5cf0307b2f8f3fc709a8ff6caf..11048c7a0e94f598b168de98d18fda9aea420c7d 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1286,7 +1286,7 @@ load_config 0
 apply_config
 
 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
-if {[package vsatisfies $_git_version 1.7.0-]} {
+if {[package vcompare $_git_version 1.7.0] >= 0} {
        if { [is_Cygwin] } {
                catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
        } else {
@@ -1542,7 +1542,7 @@ proc rescan_stage2 {fd after} {
                close $fd
        }
 
-       if {[package vsatisfies $::_git_version 1.6.3-]} {
+       if {[package vcompare $::_git_version 1.6.3] >= 0} {
                set ls_others [list --exclude-standard]
        } else {
                set ls_others [list --exclude-per-directory=.gitignore]