Durham Goode c91dc5ac70 py3: fix merge._resolvetrivial ... Summary: It depends on items() returning a list. Reviewed By: quark-zju Differential Revision: D22339205 fbshipit-source-id: 4691c981ba612ec9a00752cbcc57bf2272b59007		2020-07-02 09:05:13 -07:00
..
fs	make fetch heavy threshold configurable	2020-07-02 08:44:02 -07:00
integration	fix AssertionError if a checkout is in the middle of a merge	2020-06-30 13:58:21 -07:00
locale	add a copyright header to glibc_en.po	2019-04-26 14:38:27 -07:00
mononoke	mononoke_api: implement pagination for all bookmarks	2020-07-02 07:53:12 -07:00
scm	py3: fix merge._resolvetrivial	2020-07-02 09:05:13 -07:00
scripts	packaging: use scheduled tasks	2020-06-10 19:29:15 -07:00
test_support	enable asynchronous integration tests	2020-06-15 15:53:50 -07:00
test-data	enable treemanifest in snapshots	2019-08-28 18:46:03 -07:00
win	add .clang-format	2020-04-28 08:42:03 -07:00
.clang-format	Cut FOR_EACH_KV	2020-06-10 19:29:43 -07:00
.gitignore	eden: wire up mac contbuild	2019-02-05 21:52:30 -08:00
Eden.project.toml	Eden.project.toml file for Nuclide	2018-04-26 11:05:23 -07:00