diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-09 08:31:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 08:31:27 +0300 |
| commit | 8cc633286a4803025d84b77c808a2c7ad8616f2f (patch) | |
| tree | 624047e4917cd5113dad8f487dd8dec21985c775 /builtin/merge-ours.c | |
| parent | bde13700105a1c945819578ce8d5c0627d52c741 (diff) | |
| parent | 0d1e0e7801bb2ae22036ad09f9f5cec17e08c48b (diff) | |
Merge branch 'bw/diff-opt-impl-to-bitfields'
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
* bw/diff-opt-impl-to-bitfields:
diff: make struct diff_flags members lowercase
diff: remove DIFF_OPT_CLR macro
diff: remove DIFF_OPT_SET macro
diff: remove DIFF_OPT_TST macro
diff: remove touched flags
diff: add flag to indicate textconv was set via cmdline
diff: convert flags to be stored in bitfields
add, reset: use DIFF_OPT_SET macro to set a diff flag
Diffstat (limited to 'builtin/merge-ours.c')
| -rw-r--r-- | builtin/merge-ours.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index beb0623d56..c84c6e05e9 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -26,7 +26,7 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix) */ if (read_cache() < 0) die_errno("read_cache failed"); - if (index_differs_from("HEAD", 0, 0)) + if (index_differs_from("HEAD", NULL, 0)) exit(2); exit(0); } |