Mercurial > hg

comparison mercurial/hg.py @ 346:f69a5d2d4fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:27:20 -0800
parents db419f14df4b
children b4e0e20646bb
comparison
equal deleted inserted replaced
345:9d8d9207c0b3 346:f69a5d2d4fe1
1116 return name 1116 return name
1117 1117
1118 fl = self.file(fn) 1118 fl = self.file(fn)
1119 base = fl.ancestor(my, other) 1119 base = fl.ancestor(my, other)
1120 a = self.wjoin(fn) 1120 a = self.wjoin(fn)
1121 b = temp("other", other) 1121 b = temp("base", base)
1122 c = temp("base", base) 1122 c = temp("other", other)
1123 1123
1124 self.ui.note("resolving %s\n" % fn) 1124 self.ui.note("resolving %s\n" % fn)
1125 self.ui.debug("file %s: other %s ancestor %s\n" % 1125 self.ui.debug("file %s: other %s ancestor %s\n" %
1126 (fn, short(other), short(base))) 1126 (fn, short(other), short(base)))
1127 1127