summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-10-06 22:49:45 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2017-05-21 13:53:09 -0700
commitf9f519be9722735e5b27176df870019d46b132ec (patch)
tree831915b1b2a9cc94f7ea7e14f4de9e00950ccc28
parentMerge tag 'branch-tag' (diff)
parentTest2. (diff)
downloadtest-sandbox/robbat2-pass15.tar.gz
test-sandbox/robbat2-pass15.tar.bz2
test-sandbox/robbat2-pass15.zip
Tag merge test.
-rw-r--r--foo2
1 files changed, 1 insertions, 1 deletions
diff --git a/foo b/foo
index df565ac..9daeafb 100644
--- a/foo
+++ b/foo
@@ -1 +1 @@
-conflict2 conflict
+test