diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-10-06 22:37:48 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-10-06 22:37:48 -0700 |
| commit | d8fc983b0f0c537424eb1f1cbfcd172b1ee49cb6 (patch) | |
| tree | 7b6e0211920a4940c04668d7b0efa71fe2f564cf | |
| parent | Make a conflict. (diff) | |
| parent | Merge branch 'master' into test (diff) | |
| download | test-d8fc983b0f0c537424eb1f1cbfcd172b1ee49cb6.tar.gz test-d8fc983b0f0c537424eb1f1cbfcd172b1ee49cb6.tar.bz2 test-d8fc983b0f0c537424eb1f1cbfcd172b1ee49cb6.zip | |
Merge tag 'branch-tag'
Annoted.
| -rw-r--r-- | foo | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -conflict +conflict2 conflict |