Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ file revision
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
changeset
| file |
latest
|
revisions
|
annotate
|
diff
|
comparison
|
raw
|
help
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/fake-editor.sh
author
Pulkit Goyal <7895pulkit@gmail.com>
Mon, 11 Jun 2018 15:38:43 +0530
changeset 3829
cb45a7173e5b
parent 1742
970a4c13ebc3
permissions
-rwxr-xr-x
evolve: factor out logic to merge branches in separate function This patch moves the logic to merge branches while resolving content-divergence to a separate function. This makes code clear and better to understand.
#!/bin/sh
sleep
5
echo
"new desc"
>>
$1