solarized-emacs

commit e431d1a4349de2a4b8aeed63b8e4aee93d873ae3
parent ae1dfb3d9c15f79817c16d4eb14ae0ecc37fa569
Author: Thomas Frössman <thomasf@jossystem.se>
Date:   Mon,  4 Nov 2019 00:18:58 +0100

dev: create a .diff

Diffstat:
M
minimal-init/create-merge-conflict-repo.sh
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/minimal-init/create-merge-conflict-repo.sh b/minimal-init/create-merge-conflict-repo.sh
@@ -35,10 +35,9 @@ get_files v3.7.0
 git checkout v3
 get_files v3.8.0
 git checkout master
-
 git checkout v2
-
+git worktree add v3 v3
+git worktree add v1 v1
+(diff v1/inspect.py inspect.py > inspect_v1-v2.diff) || true
 git merge v3 || true
-
-
 git diff --color | cat