epriestley be1dd7e2ba Robustly fuse files together with arc weld ... Summary: Fixes T8236. I played around with a lot of variations of this but in the end it felt like the simple version was best. Test Plan: Ran `arc weld a.txt b.txt`, observed very robust fusion of materials. Maniphest Tasks: T8236 Differential Revision: https://secure.phabricator.com/D19081		2018-02-13 15:15:36 -08:00
..
__tests__	Use PhutilLibraryTestCase	2015-01-07 07:37:59 +11:00
configuration	Remove obsolete "arc land" flags: --update-with-merge/rebase, --delete-remote	2017-06-09 08:12:37 -07:00
difference	Don't compute intraline diffs if the input fails a coarse check for being huge	2016-10-07 07:42:19 -07:00
differential	Extend from Phobject	2015-06-15 15:47:33 +10:00
docs/book	Minor documentation improvements	2015-06-08 11:31:35 +10:00
events/constant	Remove @group annotations	2014-07-09 09:12:13 +10:00
exception	pht all the things	2015-05-13 21:00:53 +10:00
extensions	Changes to Arcanist for libphutil "extensions/"	2013-04-22 14:38:49 -07:00
hgdaemon	Fix a property name collision in ArcanistHgServerChannel	2017-02-16 05:44:10 -08:00
internationalization	Various translation improvements	2015-11-02 21:31:04 +11:00
land	Fix errors found by PHPStan	2017-02-16 13:54:43 +00:00
lint	Fix some lint rendering issues when lines prior to other identical lines are removed	2017-11-01 17:18:59 -07:00
parser	Add trailing tabs when generating synthetic Git diffs for files with spaces	2018-01-16 13:57:27 -08:00
ref	Make "arc land" accommodate a minor API change in Harbormaster build statuses	2017-12-23 11:39:19 -08:00
repository	Accelerate working tree operations in git	2017-12-23 20:12:50 -08:00
unit	Don't show a blank line if there is no user data	2017-09-20 17:54:40 -07:00
upload	Upgrade "arc upload" to use SHA256	2017-04-04 16:56:35 -07:00
workflow	Robustly fuse files together with arc weld	2018-02-13 15:15:36 -08:00
workingcopyidentity	Extend from Phobject	2015-06-15 15:47:33 +10:00
__phutil_library_init__.php	Delete license headers from files	2012-11-05 11:16:24 -08:00
__phutil_library_map__.php	Robustly fuse files together with arc weld	2018-02-13 15:15:36 -08:00