equal
deleted
inserted
replaced
56 echo |
56 echo |
57 echo Tool selection |
57 echo Tool selection |
58 echo |
58 echo |
59 |
59 |
60 echo "# default is internal merge:" |
60 echo "# default is internal merge:" |
61 domerge -r 2 |
61 beforemerge |
|
62 echo "# hg merge -r 2" |
|
63 PATH=$BINDIR hg merge -r 2 |
|
64 aftermerge |
62 |
65 |
63 echo "# simplest hgrc using false for merge:" |
66 echo "# simplest hgrc using false for merge:" |
64 echo "false.whatever=" >> .hg/hgrc |
67 echo "false.whatever=" >> .hg/hgrc |
65 domerge -r 2 |
68 domerge -r 2 |
66 |
69 |