]> git.proxmox.com Git - libgit2.git/commit - tests/merge/trees/whitespace.c
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 45a86bb) | patch
Added tests to merge files and branches with whitespace problems and fixes
authorJacques Germishuys <jacquesg@striata.com>
Mon, 9 Mar 2015 15:03:03 +0000 (17:03 +0200)
committerJacques Germishuys <jacquesg@striata.com>
Mon, 16 Mar 2015 07:53:27 +0000 (09:53 +0200)
commit0f24cac2b926e4842f6890ee1712ac2d85cc020c
tree62e3e4eb2efbc1b1be6540855147f851574ff3d8tree
parent45a86bbfd028a545a71d3e1ea5518d467be8b5aacommit | diff
Added tests to merge files and branches with whitespace problems and fixes
49 files changed:
tests/merge/files.c diff | blob | blame | history
tests/merge/trees/whitespace.c [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/HEAD [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/config [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/index [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/01/bd650462136a4f0a266dfc91ab93b3fef0f7cb [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/08/3f868fb4324e32a4999173b2437b31d7a1ef25 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/0a/a2acaa63cacc7a99fab0c2ce3d56572911df19 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/11/89e10a62aadf2fea8cd018afb52c1980f40b4f [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/24/2c8f6cf388e96e2c12b6e49cb7ae60167cba1e [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/25/246acb001858ffeffb03ea399fd2c0a163b832 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/26/2f67de0de2e535a59ae1bc3c739601e98c354d [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/2f/6727d2e570bf962d9dd926423cf6fe5072071a [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/3c/43e7fc2a56fc825c31dfee65abd6dda8d16dca [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/40/26a6c83f39c56881c9ac62e7582db9e3d33a4f [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/42/dabb8d5dba2de103815a77e4369bb3966e64ef [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/43/9230587f2eb38e9540a5c99e9831f65641eab9 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/43/ad73e75e15f03bb0b4398a48a57ecfc20788e2 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/54/74989173042512ab630191ad71cdcedb646b9a [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/5e/fb9bc29c482e023e40e0a2b3b7e49cec842034 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/70/d3d2e7d51a18fcc6f035a67e5c3f33069be04d [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/74/e83b6c5df14f1fba7c4ea1f99c6d007b591002 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/77/f40c621ceae77ad8d756ef507bdbafe2713aa7 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/9c/5362069759fb37ae036cef6e4b2f95c6c5eaab [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/a2/9e7dabd68dfb38a717e6b1648713cd5c7adee2 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/a4/e6a86e07ef5afe036e26602fbbaa27496d00a9 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/a8/27eab4fd66ab37a6ebcfaa7b7e341abfd55947 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/a9/66acc271e50b5d4595911752a77def0a5e5d40 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/b2/a69114f4897109fedf1aafea363cb2d2557029 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/bc/83ac0422ba1082c80e406234910377984cfbb6 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/bf/e4ea5805af22a5b194259bda6f5f634486f891 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/c3/b1fb31424c98072542cc8e42b48c92e52f494a [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/c7/e2f386736445936f5ba181269a0e0967e280e8 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/d9/5182053c31f8aa09df4fa225f4e668c5320b59 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/ec/5a35c75b8d3ee29bed37996b14e909d04fdcee [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/ee/3c2aac8e03224c323b58ecb1f9eef616745467 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/ef/e94a4bf4e697f7f0270f0d1b8a93af784a19d0 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/f0/0c965d8307308469e537302baa73048488f162 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/f1/90a0d111ca1688778657798743ddfb4ed4bd64 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/f4/9b2c244e9d3b0647fdfb95954c38fbfeecf3ad [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/objects/f8/7905f99f0e66d179a8379d8ca4d8cbbd32c231 [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol [new file with mode: 0644] blob
tests/resources/merge-whitespace/.gitted/refs/heads/master [new file with mode: 0644] blob
tests/resources/merge-whitespace/test.txt [new file with mode: 0644] blob
The git library used in some Proxmox tool chains