diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-25 10:47:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 10:47:46 -0700 |
| commit | b5496cbd2291443b0ad0bf686db51fce6ffad863 (patch) | |
| tree | f94de64568d0607ed1531920889dca82f877873a /builtin | |
| parent | Ninth batch for 2.5 (diff) | |
| parent | Revert "diff-lib.c: adjust position of i-t-a entries in diff" (diff) | |
| download | tgif-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.xz | |
Merge branch 'nd/diff-i-t-a'
* nd/diff-i-t-a:
Revert "diff-lib.c: adjust position of i-t-a entries in diff"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/add.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index df5135bf62..4bd98b799e 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -63,7 +63,6 @@ static void update_callback(struct diff_queue_struct *q, switch (fix_unmerged_status(p, data)) { default: die(_("unexpected diff status %c"), p->status); - case DIFF_STATUS_ADDED: case DIFF_STATUS_MODIFIED: case DIFF_STATUS_TYPE_CHANGED: if (add_file_to_index(&the_index, path, data->flags)) { |