diff --git a/git-gui.sh b/git-gui.sh
index 1981827a8e8..0e448007f7c 100755
--- 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.