![]() ![]() | ![]() |
version 1.5, 2014/06/09 08:46:25 | version 1.6, 2014/06/09 08:47:26 |
---|---|
Line 100 Commit the patches | Line 100 Commit the patches |
$ vi file/marked/as/U | $ vi file/marked/as/U |
$ hg resolve --mark file/marked/as/U | $ hg resolve --mark file/marked/as/U |
(loop) | (loop) |
$ hg commit -m "Merge pkgsrc_firefox-29.0.1 brnach to 30.0" | $ hg commit -m "Merge pkgsrc_firefox-29.0.1 branch to 30.0" |
# Create patch file for patch -p0 | # Create patch file for patch -p0 |