diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:04 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | ffc00a48efe8f591a05f8e7b61f632bcaf098dde (patch) | |
| tree | 7f45042103cf0de842143abb2d62f790f586dbbc /builtin/merge-ours.c | |
| parent | delta-islands.c: remove the_repository references (diff) | |
| download | tgif-ffc00a48efe8f591a05f8e7b61f632bcaf098dde.tar.xz | |
diff-lib.c: remove the_repository references
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 c84c6e05e9..0b07263415 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", NULL, 0)) + if (index_differs_from(the_repository, "HEAD", NULL, 0)) exit(2); exit(0); } |