diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-05-05 12:02:37 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-05-05 12:02:37 -0700 |
| commit | 2e5b5012cb4a3edd68c83021992692e7bcee1543 (patch) | |
| tree | bab0c721dafd92cafe08562c7af6070e524e4aad | |
| parent | Merge remote-tracking branch 'origin/test' (diff) | |
| download | test-2e5b5012cb4a3edd68c83021992692e7bcee1543.tar.gz test-2e5b5012cb4a3edd68c83021992692e7bcee1543.tar.bz2 test-2e5b5012cb4a3edd68c83021992692e7bcee1543.zip | |
Make a conflict.
| -rw-r--r-- | foo | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -bar +conflict2 |