Created
August 25, 2019 19:03
-
-
Save tmbdev/4e0992a7574f1a7163c7480df2ba4355 to your computer and use it in GitHub Desktop.
nbdime for mercurical notebook merging
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [extensions] | |
| extdiff = | |
| [extdiff] | |
| cmd.nbdiff = hg-nbdiff | |
| cmd.nbdiffweb = hg-nbdiffweb | |
| opts.nbdiffweb = --log-level ERROR | |
| [merge-tools] | |
| nbdime.priority = 2 | |
| nbdime.premerge = False | |
| nbdime.executable = hg-nbmerge | |
| nbdime.args = $base $local $other $output | |
| nbdimeweb.priority = 1 | |
| nbdimeweb.premerge = False | |
| nbdimeweb.executable = hg-nbmergeweb | |
| nbdimeweb.args = --log-level ERROR $base $local $other $output | |
| nbdimeweb.gui = True | |
| [merge-patterns] | |
| **.ipynb = nbdime |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment