diff options
-rwxr-xr-x | dgit | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1549,6 +1549,9 @@ $later_warning_msg END @output = $lastpush_mergeinput; } else { + # Same version. Use what's in the server git branch, + # discarding our own import. (This could happen if the + # server automatically imports all packages into git.) @output = $lastpush_mergeinput; } } |