Mon, 03 Dec 2018 11:14:44 -0800 | Martin von Zweigbergk | rebase: fix dir/file conflict detection when using in-mem merge | changeset | files |
Mon, 03 Dec 2018 11:11:34 -0800 | Martin von Zweigbergk | tests: show that in-mem rebase does not find path dir/file conflicts | changeset | files |