diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-05-05 12:02:58 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-05-05 12:02:58 -0700 |
| commit | d964e5ba061f1f4307cc7603b127f3f13cf5bdb5 (patch) | |
| tree | 7b6e0211920a4940c04668d7b0efa71fe2f564cf | |
| parent | Make a conflict. (diff) | |
| parent | Make a conflict. (diff) | |
| download | test-d964e5ba061f1f4307cc7603b127f3f13cf5bdb5.tar.gz test-d964e5ba061f1f4307cc7603b127f3f13cf5bdb5.tar.bz2 test-d964e5ba061f1f4307cc7603b127f3f13cf5bdb5.zip | |
Merge branch 'master' into testtest
| -rw-r--r-- | foo | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -conflict2 +conflict2 conflict |