This is a test
Test1.txt had been modified
This is a test for remote origin
A change
test clean
test revert
Revert "test revert"

This reverts commit afe88a8dbc879d2b4b635119ae5d9437e9ef141c.
Revert "Revert "test revert""

This reverts commit 5a7dc457b86de10c1523eb08144c65fdd90adb0f.
Revert "test revert"

This reverts commit afe88a8dbc879d2b4b635119ae5d9437e9ef141c.
Revert "A change"

This reverts commit 266046fb1d0d1066c66f0ad4326226c50a78a29b.

Conflicts:
	test1.txt
Revert "test clean"

This reverts commit 36d9b68cf33d46af0a936f5a78ec23dd7cad9cac.
Merge remote-tracking branch 'upstream/master'
test