# On branch devel # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: library/12-exceptions.js # new file: library/13-methods.js # modified: library/20-type-iter.js # modified: library/23-type-list.js # modified: library/24-type-dict.js # modified: library/26-type-number.js # modified: library/28-type-none.js # modified: tests/test_builtins.js # # Unmerged paths: # (use "git reset HEAD ..." to unstage) # (use "git add/rm ..." as appropriate to mark resolution) # # both modified: library/05-init.js # both modified: library/10-builtin.js # both modified: library/11-classes.js # both modified: library/22-type-tuple.js # both modified: library/25-type-str.js # both modified: library/27-type-bool.js # deleted by us: library/60-sprintf.js # both modified: py2js/compiler/python.py # # Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # modified: library/60-string-format.js # # Untracked files: # (use "git add ..." to include in what will be committed) # # 1 # datadumper.js # examples/gol.html # examples/triangulation.html # examples/ui.html # res # work/