592   you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.

   592   you can keep (l)ocal e5bb990443d6a92aaf7223813720f7566c9dd05b or take (o)ther 58e24f733a964da346e2407a2bee99d9001184f5.

   593   what do you want to do? o

   593   what do you want to do? o

   594   merging normal1

   594   merging normal1

   595   warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')

   595   warning: conflicts while merging normal1! (edit, then use 'hg resolve --mark')

   596   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')

   596   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')

   598   $ cat .hglf/large1

   598   $ cat .hglf/large1

   599   58e24f733a964da346e2407a2bee99d9001184f5

   599   58e24f733a964da346e2407a2bee99d9001184f5

   600   $ cat large1

   600   $ cat large1

   601   large1 in #1

   601   large1 in #1

   602   $ rm normal1.orig

   602   $ rm normal1.orig

   760   > def getlfilestoupdate(oldstandins, newstandins):

   760   > def getlfilestoupdate(oldstandins, newstandins):

   761   >      raise SystemExit(7)

   761   >      raise SystemExit(7)

   762   > hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate

   762   > hgext.largefiles.lfutil.getlfilestoupdate = getlfilestoupdate

   763   > EOF

   763   > EOF

   764   $ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py

   764   $ hg up -Cr "8" --config extensions.crashupdatelfiles=../crashupdatelfiles.py

   766 Check large1 content and status ... and that update will undo modifications:

   766 Check large1 content and status ... and that update will undo modifications:

   767   $ cat large1

   767   $ cat large1

   768   large1 in #3

   768   large1 in #3

   769   $ hg st

   769   $ hg st

   770   M large1

   770   M large1