Wed, 27 Dec 2017 13:53:21 -0600 | Phil Cohen | merge: raise before running mergedriver if using IMM | file | diff | annotate |
Thu, 07 Dec 2017 13:20:47 -0800 | Phil Cohen | merge: don't check for unknown files in IMM | file | diff | annotate |
Fri, 01 Dec 2017 00:07:23 -0800 | Phil Cohen | merge: skip subrepo state, update hooks, and updating the dirstate in IMM | file | diff | annotate |