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
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user