Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cb/curl-use-xmalloc'
[gitweb.git]
/
wt-status.h
diff --git
a/wt-status.h
b/wt-status.h
index 8849768e9234aeebced0e4a244ead366907e0a04..77dad5b92048851c622a35d8b34d802fbd0ecac6 100644
(file)
--- a/
wt-status.h
+++ b/
wt-status.h
@@
-64,6
+64,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;