summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-05-05 12:02:58 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-05-05 12:02:58 -0700
commitd964e5ba061f1f4307cc7603b127f3f13cf5bdb5 (patch)
tree7b6e0211920a4940c04668d7b0efa71fe2f564cf
parentMake a conflict. (diff)
parentMake a conflict. (diff)
downloadtest.tar.gz
test.tar.bz2
test.zip
Merge branch 'master' into testtest
-rw-r--r--foo2
1 files changed, 1 insertions, 1 deletions
diff --git a/foo b/foo
index f853c8d..df565ac 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-conflict2
+conflict2 conflict