projects / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a77090b 6bf9b77)
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:04:31 +0000 (00:04 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:04:31 +0000 (00:04 +0100)
Conflicts:
test1.txt
Keeping user2 text in merge


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