?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 9dc2922) | patch
new test for conflicts.
commit3c9b783cdbfbcfc31b6d041c0aa000bb338e9156
authorHan-Wen Nienhuys <hanwen@lilypond.org>
Mon, 12 Feb 2007 19:03:40 +0000 (12 20:03 +0100)
committerHan-Wen Nienhuys <hanwen@lilypond.org>
Mon, 12 Feb 2007 19:03:40 +0000 (12 20:03 +0100)
tree8c87512dd1612415c5f2d506976e7279896da700tree | snapshot (tar.gz zip)
parent9dc29223bab380f01c8ad5d0781141ff7c366961commit | diff
new test for conflicts.
15 files changed:
tests/test-longconflict/_darcs/inventory [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172824-bf48b-b8684693fbc7370e48ab55d02a1afa62d0085228.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172833-bf48b-c5c72873a1ed94dcdba7242e68e96189c5e2df27.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172906-bf48b-e66e1a07cef6e836fc78de3d813c2e61c0d0f057.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172929-bf48b-3acd307370805435c06b51e3ff4e49d082c8d8a4.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172948-bf48b-9e4ec8cdeb6db98092e411a47d35a381c98043be.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212172953-bf48b-c6a86512a238cee5983ad5b8b51285e78b0ca3bb.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/patches/20070212173024-bf48b-575f6f86173f8bf5fbbe69465be4b4aa076343db.gz [new file with mode: 0644] blob
tests/test-longconflict/_darcs/prefs/binaries [new file with mode: 0644] blob
tests/test-longconflict/_darcs/prefs/boring [new file with mode: 0644] blob
tests/test-longconflict/_darcs/prefs/defaultrepo [new file with mode: 0644] blob
tests/test-longconflict/_darcs/prefs/motd [new file with mode: 0644] blob
tests/test-longconflict/_darcs/prefs/repos [new file with mode: 0644] blob
tests/test-longconflict/_darcs/pristine/a [new file with mode: 0644] blob
tests/test-longconflict/a [new file with mode: 0644] blob
import darcs using fast-import