diff tests/test-rebase-conflicts.t @ 24436:66a69da9cde4

largefiles: override cmdutil.revert() instead of comands.revert() By overriding the cmdutil method we don't need to override both the function and the command. Also, we get access to the 'ctx' and 'parents' variables, which will soon prove useful. Rename the 'ctx' argument to overridematch() to 'mctx' rather than letting it shadow new 'ctx'.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 20 Mar 2015 10:05:31 -0700
parents 9347c15d8136
children bd625cd4e5e7 af5b2f4ed594
line wrap: on
line diff