from2 2030 src/diffviewer/ydiff.c dview_add_hunk (WDiff *dview, FILE *merge_file, int from1, int from2, int to2, from2 2053 src/diffviewer/ydiff.c if (line >= from2) from2 2077 src/diffviewer/ydiff.c dview_replace_hunk (WDiff *dview, FILE *merge_file, int from1, int to1, int from2, int to2, from2 2100 src/diffviewer/ydiff.c if (line2 >= from2) from2 2124 src/diffviewer/ydiff.c int from1, to1, from2, to2; from2 2129 src/diffviewer/ydiff.c hunk = get_current_hunk (dview, &from2, &to2, &from1, &to1); from2 2131 src/diffviewer/ydiff.c hunk = get_current_hunk (dview, &from1, &to1, &from2, &to2); from2 2165 src/diffviewer/ydiff.c dview_add_hunk (dview, merge_file, from1, from2, to2, FROM_RIGHT_TO_LEFT); from2 2173 src/diffviewer/ydiff.c dview_add_hunk (dview, merge_file, from1, from2, to2, FROM_LEFT_TO_RIGHT); from2 2176 src/diffviewer/ydiff.c dview_replace_hunk (dview, merge_file, from1, to1, from2, to2, merge_direction);