projects / test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2117fb 3cc8700)
Merge branch 'master' of ssh://nsweb.tn.tudelft.nl/home/gsteele/git/test
authorGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:21:39 +0000 (00:21 +0100)
committerGary Macbook <gsteele13@gmail.com>
Wed, 18 Nov 2015 23:21:39 +0000 (00:21 +0100)
Conflicts solved automatically this time.

1  2 
test1.txt patch | diff1 | diff2 | blob | history

diff --cc test1.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.