##// END OF EJS Templates
largefiles: remove additional blank lines...
liscju -
r29420:e5c91dc9 default
parent child Browse files
Show More
@@ -31,7 +31,6 b" shortname = '.hglf'"
31 31 shortnameslash = shortname + '/'
32 32 longname = 'largefiles'
33 33
34
35 34 # -- Private worker functions ------------------------------------------
36 35
37 36 def getminsize(ui, assumelfiles, opt, default=10):
@@ -260,7 +259,6 b' def copyalltostore(repo, node):'
260 259 realfile = splitstandin(filename)
261 260 copytostore(repo, ctx.node(), realfile)
262 261
263
264 262 def copytostoreabsolute(repo, file, hash):
265 263 if inusercache(repo.ui, hash):
266 264 link(usercachepath(repo.ui, hash), storepath(repo, hash))
@@ -546,7 +546,6 b' def mergerecordupdates(orig, repo, actio'
546 546
547 547 return orig(repo, actions, branchmerge)
548 548
549
550 549 # Override filemerge to prompt the user about how they wish to merge
551 550 # largefiles. This will handle identical edits without prompting the user.
552 551 def overridefilemerge(origfn, premerge, repo, mynode, orig, fcd, fco, fca,
General Comments 0
You need to be logged in to leave comments. Login now