summaryrefslogtreecommitdiff
path: root/foo
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-05-05 12:02:02 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-05-05 12:02:02 -0700
commit1e48467370c1ab2e5a0e5947d3a1e934d1ae4914 (patch)
treee10ae12e0ecb1d72e10af2d0f2a33edd911591a7 /foo
parentMerge remote-tracking branch 'origin/test' (diff)
downloadtest-1e48467370c1ab2e5a0e5947d3a1e934d1ae4914.tar.gz
test-1e48467370c1ab2e5a0e5947d3a1e934d1ae4914.tar.bz2
test-1e48467370c1ab2e5a0e5947d3a1e934d1ae4914.zip
Make a conflict.
Diffstat (limited to 'foo')
-rw-r--r--foo2
1 files changed, 1 insertions, 1 deletions
diff --git a/foo b/foo
index 5716ca5..9b1719f 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-bar
+conflict