diff options
Diffstat (limited to 'integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts')
| -rw-r--r-- | integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts b/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts new file mode 100644 index 000000000..0dc2d3a0f --- /dev/null +++ b/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts @@ -0,0 +1 @@ +BZR conflict list format 1 |