projects / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3a8796 f96ab1d)
Overriding the changes that user 1 made
authorGary Macbook <gsteele13@gmail.com>
Thu, 19 Nov 2015 09:29:08 +0000 (10:29 +0100)
committerGary Macbook <gsteele13@gmail.com>
Thu, 19 Nov 2015 09:29:08 +0000 (10:29 +0100)
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test

Conflicts:
test1.txt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.