equal
deleted
inserted
replaced
671 > q |
671 > q |
672 > EOF |
672 > EOF |
673 diff --git a/subdir/f1 b/subdir/f1 |
673 diff --git a/subdir/f1 b/subdir/f1 |
674 1 hunks, 1 lines changed |
674 1 hunks, 1 lines changed |
675 examine changes to 'subdir/f1'? [Ynesfdaq?] |
675 examine changes to 'subdir/f1'? [Ynesfdaq?] |
676 y - record this change |
676 y - yes, record this change |
677 n - skip this change |
677 n - no, skip this change |
678 e - edit this change manually |
678 e - edit this change manually |
679 s - skip remaining changes to this file |
679 s - skip remaining changes to this file |
680 f - record remaining changes to this file |
680 f - record remaining changes to this file |
681 d - done, skip remaining changes and files |
681 d - done, skip remaining changes and files |
682 a - record all changes to all remaining files |
682 a - record all changes to all remaining files |
683 q - quit, recording no changes |
683 q - quit, recording no changes |
684 ? - display help |
684 ? - ? (display help) |
685 examine changes to 'subdir/f1'? [Ynesfdaq?] |
685 examine changes to 'subdir/f1'? [Ynesfdaq?] |
686 abort: user quit |
686 abort: user quit |
687 [255] |
687 [255] |
688 |
688 |
689 Skip |
689 Skip |