Siddharth Agarwal f5d6c8e713 largefiles: fall back to the original for change/delete conflicts ... The largefiles merge code (currently) does not handle change/delete conflicts. So fall back to regular filemerge in that case. Making this code handle change/delete conflicts is left as an exercise for the future.		2015-11-18 17:40:13 -08:00
..
__init__.py	extensions: document that testedwith = 'internal' is special	2015-04-28 16:44:37 -04:00
basestore.py	error: get Abort from 'error' instead of 'util'	2015-10-08 12:55:45 -07:00
CONTRIBUTORS	hgext: add largefiles extension	2011-09-24 17:35:45 +02:00
lfcommands.py	largefiles: specify where .orig files are kept	2015-11-10 15:08:56 -08:00
lfutil.py	largefiles: check hash of files in the store before copying to working dir	2015-10-23 21:27:29 +02:00
localstore.py	largefiles: use lfutil.findstorepath() when verifying a local repo	2015-04-04 19:34:36 -04:00
overrides.py	largefiles: fall back to the original for change/delete conflicts	2015-11-18 17:40:13 -08:00
proto.py	largefiles: don't mute and obfuscate http errors when putlfile fails	2015-10-23 21:27:29 +02:00
remotestore.py	error: get Abort from 'error' instead of 'util'	2015-10-08 12:55:45 -07:00
reposetup.py	error: get Abort from 'error' instead of 'util'	2015-10-08 12:55:45 -07:00
uisetup.py	filemerge: add a wrapper around the filemerge function	2015-10-11 12:31:08 -07:00
wirestore.py	largefiles: stat all largefiles in one batch before downloading	2013-04-15 23:37:43 +02:00