Skip to content

Commit

Permalink
updated readme + other changes
Browse files Browse the repository at this point in the history
  • Loading branch information
cactusbranch01 committed May 2, 2024
1 parent 96a4262 commit 5802ef8
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/python/diff3_analysis.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""
Recreates a merge and outputs the diff files for two algorithms for comparison on a given conflict.
See src/python/README.md for details on usage.
"""

import sys
Expand Down

0 comments on commit 5802ef8

Please sign in to comment.