summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdgit3
1 files changed, 3 insertions, 0 deletions
diff --git a/dgit b/dgit
index d3b2ec7..b59d00a 100755
--- a/dgit
+++ b/dgit
@@ -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;
}
}