mercurial: comparison tests/test-amend.t

equal deleted inserted replaced

-:3f807237dc94
+:6acbe86c6490
 ? content1_missing_content3-untracked
 ? missing_content2_content2-untracked
 ? missing_content2_content3-untracked
 ? missing_missing_content3-untracked
-==========================================
+=================================
-Test history-editing-backup config option|
+Test backup-bundle config option|
-==========================================
+=================================
 $ hg init $TESTTMP/repo4
 $ cd $TESTTMP/repo4
 $ echo a>a
 $ hg ci -Aqma
 $ echo oops>b
 $ echo partiallyfixed > b
 #if obsstore-off
 $ hg amend
 saved backup bundle to $TESTTMP/repo4/.hg/strip-backup/95e899acf2ce-f11cb050-amend.hg
-When history-editing-backup config option is set:
+When backup-bundle config option is set:
 $ cat << EOF >> $HGRCPATH
-> [ui]
+> [rewrite]
-> history-editing-backup = False
+> backup-bundle = False
 > EOF
 $ echo fixed > b
 $ hg amend
 #else
 $ hg amend
-When history-editing-backup config option is set:
+When backup-bundle config option is set:
 $ cat << EOF >> $HGRCPATH
-> [ui]
+> [rewrite]
-> history-editing-backup = False
+> backup-bundle = False
 > EOF
 $ echo fixed > b
 $ hg amend
 #endif