Mercurial > hg

annotate tests/bundles/remote.hg @ 26959:ed5f20f9c22e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: restore .orig only after merge is fully complete (issue4952) Previously, we'd restore the .orig file after the premerge is complete but before the merge was complete. This would lead to the .orig file potentially containing merge conflict markers in it, as a leftover from the last merge attempt.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 15:56:02 -0800
parents 07708f4171f1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
1 (binary:application/octet-stream)