summaryrefslogtreecommitdiff
path: root/diff/.bzr/checkout
diff options
context:
space:
mode:
Diffstat (limited to 'diff/.bzr/checkout')
-rw-r--r--diff/.bzr/checkout/conflicts1
-rw-r--r--diff/.bzr/checkout/dirstatebin0 -> 2727 bytes
-rw-r--r--diff/.bzr/checkout/format1
3 files changed, 2 insertions, 0 deletions
diff --git a/diff/.bzr/checkout/conflicts b/diff/.bzr/checkout/conflicts
new file mode 100644
index 0000000..0dc2d3a
--- /dev/null
+++ b/diff/.bzr/checkout/conflicts
@@ -0,0 +1 @@
+BZR conflict list format 1
diff --git a/diff/.bzr/checkout/dirstate b/diff/.bzr/checkout/dirstate
new file mode 100644
index 0000000..1ee2b41
--- /dev/null
+++ b/diff/.bzr/checkout/dirstate
Binary files differ
diff --git a/diff/.bzr/checkout/format b/diff/.bzr/checkout/format
new file mode 100644
index 0000000..9ffb5e4
--- /dev/null
+++ b/diff/.bzr/checkout/format
@@ -0,0 +1 @@
+Bazaar Working Tree Format 4 (bzr 0.15)