/stdhome

To get this branch, use:

bzr branch
http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/walker/conflict.py

Committer: Tim Marston
Date: 2021-09-01 13:06:23 UTC
Revision ID: tim@ed.am-20210901130623-2yv2y02e3zwgd07y

fix newlines in resolve command

files added:
lib/stdhome/command/stage_add.py

lib/stdhome/command/stage_commit.py

lib/stdhome/command/stage_status.py

files renamed:
lib/stdhome/vcs/bzr.py => lib/stdhome/vcs/brz.py

files modified:
configure.ac

lib/stdhome/Makefile.am

lib/stdhome/command/add.py

lib/stdhome/command/command.py

lib/stdhome/command/diff.py

lib/stdhome/command/init.py

lib/stdhome/command/resolve.py

lib/stdhome/command/revert.py

lib/stdhome/command/stage_revert.py

lib/stdhome/command/status.py

lib/stdhome/command/update.py

lib/stdhome/config.py

lib/stdhome/deployment.py

lib/stdhome/program.py

lib/stdhome/repo.py

lib/stdhome/the.py

lib/stdhome/vcs/vcs.py

lib/stdhome/walker/conflict.py

lib/stdhome/walker/copy_base.py

lib/stdhome/walker/copy_in.py

lib/stdhome/walker/copy_out.py

lib/stdhome/walker/status.py

lib/stdhome/walker/walker.py

src/stdhome.in

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict.py

20

20

21

21

22

22

import filecmp, os

23

from walker import Walker

23

from .walker import Walker

24

24

import stdhome.the as the

25

25

26

26