equal
deleted
inserted
replaced
939 [1] |
939 [1] |
940 $ echo 'merge 2' > foo |
940 $ echo 'merge 2' > foo |
941 $ hg resolve -m foo |
941 $ hg resolve -m foo |
942 $ hg ci -m "Last merge, related" |
942 $ hg ci -m "Last merge, related" |
943 |
943 |
944 $ hg --config "extensions.graphlog=" glog |
944 $ hg log --graph |
945 @ changeset: 10:4dae8563d2c5 |
945 @ changeset: 10:4dae8563d2c5 |
946 |\ tag: tip |
946 |\ tag: tip |
947 | | parent: 9:7b35701b003e |
947 | | parent: 9:7b35701b003e |
948 | | parent: 4:88176d361b69 |
948 | | parent: 4:88176d361b69 |
949 | | user: test |
949 | | user: test |