Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/oidhash'
[gitweb.git]
/
wt-status.h
diff --git
a/wt-status.h
b/wt-status.h
index 64f1ddc9fd9950f7dbe3b0889bf2085111814cec..b0cfdc8011c3cf06db89f1fa19c9c2586fcfe4df 100644
(file)
--- a/
wt-status.h
+++ b/
wt-status.h
@@
-65,6
+65,9
@@
enum wt_status_format {
STATUS_FORMAT_UNSPECIFIED
};
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
struct wt_status_state {
int merge_in_progress;
int am_in_progress;