vrana 80d9a276f3 Automatically resolve merge conflicts in Celerity map ... Summary: We can use `.gitattributes` instead but there's no way how to set repository config for all users in Git, right? So provide a script writting to `.git/info/attributes` instead so that we don't have to .gitignore `.gitattributes`. Test Plan: $ scripts/celerity/install_merge.sh $ git pull # with merge conflict in Celerity map Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3228		2012-08-09 15:59:18 -07:00
..
aphront	Use PhabricatorEnv::newObjectFromConfig() wherever possible	2012-03-21 14:57:52 -07:00
calendar	Display holidays	2012-05-03 09:22:52 -07:00
celerity	Automatically resolve merge conflicts in Celerity map	2012-08-09 15:59:18 -07:00
conduit	Depend on class autoloading	2012-05-30 16:57:21 -07:00
daemon	Separates the PID and log directories of daemons	2012-08-05 08:35:24 +02:00
differential	Provide a script to completely destroy revisions	2012-06-19 11:52:50 -07:00
drydock	Depend on class autoloading	2012-05-30 16:57:21 -07:00
fact	Add FactCursors and application fact datasources	2012-07-30 10:43:49 -07:00
fpm	Fix minor issues with D2630	2012-06-06 09:12:42 -07:00
install	Simplify daemon management: "phd start"	2012-05-09 10:29:37 -07:00
mail	Depend on class autoloading	2012-05-30 16:57:21 -07:00
repository	Use binary_safe_diff from arcanist	2012-07-03 13:51:37 -07:00
search	Merge __init_env__.php into __init_script__.php	2011-10-02 11:48:09 -07:00
setup	Test for pcntl availability from the command line, not Apache	2011-05-30 21:02:08 -07:00
sql	Support PhabricatorOpaqueEnvelope for managing database passwords	2012-07-24 11:13:53 -07:00
symbols	Update symbol generation scripts	2012-08-08 17:06:05 -07:00
user	Use OpaqueEnvelopes for all passwords in Phabricator	2012-07-17 12:06:33 -07:00
util	Use the unified markup cache for Maniphest	2012-07-11 11:40:10 -07:00
__init_script__.php	Initialize translator after loading custom libraries	2012-06-21 15:57:51 -07:00
celerity_mapper.php	Allow specifying custom celerity resource map	2012-06-04 18:45:03 -07:00