Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
transport: update flags to be in running order
[gitweb.git]
/
wt-status.h
diff --git
a/wt-status.h
b/wt-status.h
index a4bddcf8db5840de33c10be80864084fc596ea24..c60f40a34a89ccdacdc864203d4441cf3e20bcc5 100644
(file)
--- a/
wt-status.h
+++ b/
wt-status.h
@@
-34,6
+34,7
@@
struct wt_status {
const char **pathspec;
int verbose;
int amend;
+ int in_merge;
int nowarn;
int use_color;
int relative_paths;