diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg <Tim@web> | 2013-11-14 16:20:05 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-11-14 16:20:05 +0000 |
| commit | b61e48dd1d82572f80a5df4a046fb9d974e77a06 (patch) | |
| tree | 91a040045aad3848a83b177b911d7b19c0d6453c | |
| parent | 628869f099fde9193a71047a7be01cfcf268c150 (diff) | |
| -rw-r--r-- | doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn index db9a64959..857603bed 100644 --- a/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn +++ b/doc/bugs/Incorrect_merge___40__a_special_case__41__.mdwn @@ -35,9 +35,11 @@ test/a$ git annex sync """]] ### What version of git-annex are you using? On what operating system? +[[!format sh """ git-annex version: 4.20131031-g7d99d14 build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi TDFA CryptoHash key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL remote types: git gcrypt S3 bup directory rsync web webdav glacier hook Linux ceilingcat 3.11.6-1-ARCH #1 SMP PREEMPT Fri Oct 18 23:22:36 CEST 2013 x86_64 GNU/Linux +"""]] |