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