equal
deleted
inserted
replaced
938 state.printchunkstats() |
938 state.printchunkstats() |
939 elif not ui.quiet: |
939 elif not ui.quiet: |
940 ui.write(_('nothing applied\n')) |
940 ui.write(_('nothing applied\n')) |
941 return state |
941 return state |
942 |
942 |
943 @command('^absorb|sf', |
943 @command('^absorb', |
944 [('p', 'print-changes', None, |
944 [('p', 'print-changes', None, |
945 _('print which changesets are modified by which changes')), |
945 _('print which changesets are modified by which changes')), |
946 ('i', 'interactive', None, |
946 ('i', 'interactive', None, |
947 _('interactively select which chunks to apply (EXPERIMENTAL)')), |
947 _('interactively select which chunks to apply (EXPERIMENTAL)')), |
948 ('e', 'edit-lines', None, |
948 ('e', 'edit-lines', None, |