Mercurial > hg-stable
comparison tests/test-bdiff.py.out @ 23111:0dae9147c3b6 stable
help: refer ":merge3" instead of "internal:merge3"
According to warning message (introduced by 38e0363dcbe0) in
filemerge.py, the former should be used as official name.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 01 Nov 2014 02:43:08 +0900 |
| parents | eeac5e179243 |
| children | 9a8363d23419 |
comparison
equal
deleted
inserted
replaced
| 23110:692bde7f486d | 23111:0dae9147c3b6 |
|---|