OSDN Git Service
(root)
/
open-mgl
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
マージのテスト
[open-mgl/test.git]
/
test
/
hoge.txt
diff --git
a/test/hoge.txt
b/test/hoge.txt
index
ca9084a
..
2a03603
100644
(file)
--- a/
test/hoge.txt
+++ b/
test/hoge.txt
@@
-1
+1
@@
-
sdfaadsasdfasadf
sdasfdaf
\ No newline at end of file
+
XXXXXXXXXXX
sdasfdaf
\ No newline at end of file