Mercurial > public > mercurial-scm > hg-stable

diff hgext/largefiles/overrides.py @ 48543:608a35db186c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: stop returning always-`True` value Now that we've removed some more leftovers from "merge driver", it's clear that the first element of `filemerge()`'s return value is always `True`. Differential Revision: https://phab.mercurial-scm.org/D11885
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 07 Dec 2021 21:17:18 -0800
parents f45a4a47f6a8
children d536d4afe003
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Mon Dec 06 13:43:00 2021 -0800
+++ b/hgext/largefiles/overrides.py	Tue Dec 07 21:17:18 2021 -0800
@@ -695,7 +695,7 @@
         )
     ):
         repo.wwrite(fcd.path(), fco.data(), fco.flags())
-    return True, 0, False
+    return 0, False
 
 
 @eh.wrapfunction(copiesmod, b'pathcopies')