summaryrefslogtreecommitdiffstatsabout
authorClement Balay <cle.balay@gmail.com>2012-03-30 16:18:33 (GMT)
committer Clement Balay <cle.balay@gmail.com>2012-03-30 16:18:33 (GMT)
commit6e13be6a7ff4367de19f587de3aa272c0a1e6064 (patch) (side-by-side diff)
treefeba5aab5dfdc88818b6569d60288b4c0f8008c6
parentca1b5ef04c2cb34b0074a451698b63b986699c3d (diff)
parent24942717298f4c05cef8f346ca1703619efa9551 (diff)
downloadproject1-6e13be6a7ff4367de19f587de3aa272c0a1e6064.zip
project1-6e13be6a7ff4367de19f587de3aa272c0a1e6064.tar.gz
Merge branch 'toto'
Conflicts: toto.txt Signed-off-by: Clement Balay <cle.balay@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--toto.txt2
-rw-r--r--tutu.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/toto.txt b/toto.txt
index 452a539..e3db774 100644
--- a/toto.txt
+++ b/toto.txt
@@ -1 +1 @@
-totu \ No newline at end of file
+totau<<<<<<< .minetotu=======tota>>>>>>> .theirs \ No newline at end of file
diff --git a/tutu.txt b/tutu.txt
new file mode 100644
index 0000000..c8da7b9
--- a/dev/null
+++ b/tutu.txt
@@ -0,0 +1 @@
+tutu \ No newline at end of file