git-gui: Allow committing empty merges

diff --git a/git-gui.sh b/git-gui.sh
index 1981827a8e8bcc2b2e43598bb06e3e6c87bd4d1d..0e448007f7c3cd4a109dd5920bc9d1fc6a21b483 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1171,7 +1171,7 @@ File [short_path $path] cannot be committed by this program.
                }
                }
        }
-       if {!$files_ready} {
+       if {!$files_ready && ![string match *merge $curType]} {
                info_popup {No changes to commit.
 
 You must add at least 1 file before you can commit.