| Wed, 10 Dec 2014 23:46:47 -0500 | Enrique A. Tobis | tests: fix a typo in test-walkrepos.py | changeset | files |
| Wed, 03 Dec 2014 13:50:28 -0800 | Martin von Zweigbergk | merge: extract _resolvetrivial() function | changeset | files |
| Tue, 09 Dec 2014 22:10:51 -0800 | Martin von Zweigbergk | largefiles: start by finding files of interest | changeset | files |
| Tue, 09 Dec 2014 22:03:53 -0800 | Martin von Zweigbergk | largefiles: rewrite merge code using dictionary with entry per file | changeset | files |
| Tue, 09 Dec 2014 09:53:26 -0800 | Martin von Zweigbergk | largefiles: put same 'action' object back in 'newglist' | changeset | files |
| Mon, 08 Dec 2014 15:20:42 -0800 | Martin von Zweigbergk | largefiles: don't unnecessarily sort merge action lists | changeset | files |
| Tue, 09 Dec 2014 16:49:55 -0800 | Martin von Zweigbergk | merge: don't treat 'diverge' and 'renamedelete' like actions | changeset | files |
| Tue, 09 Dec 2014 14:18:31 -0800 | Martin von Zweigbergk | merge: move dr/rd warning messages out of applyupdates() | changeset | files |