Contents

Merge commit

# Conflicts:
#	file
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   file
#

Version data entries

2 entries across 2 versions & 1 rubygems

Version	Path
danger-linear_history-0.0.2	spec/fixtures/nonlinear/COMMIT_EDITMSG
danger-linear_history-0.0.1	spec/fixtures/nonlinear/COMMIT_EDITMSG