am: suppress apply errors when using 3-way

diff --git a/git-gui/lib/database.tcl b/git-gui/lib/database.tcl
index d66aa3fe3367e0a8db0ee5c90925352a3a143198..a18ac8b4308d8263a0688058524282b72bafe77a 100644 (file)
--- a/git-gui/lib/database.tcl
+++ b/git-gui/lib/database.tcl
@@ -102,8 +102,8 @@ proc hint_gc {} {
                *]]
 
        if {$objects_current >= $object_limit} {
-               set objects_current [expr {$objects_current * 256}]
-               set object_limit    [expr {$object_limit    * 256}]
+               set objects_current [expr {$objects_current * 250}]
+               set object_limit    [expr {$object_limit    * 250}]
                if {[ask_popup \
                        [mc "This repository currently has approximately %i loose objects.