tests/test-merge-default.t
changeset 33089 9e0d222f5687
parent 33054 a49ab7f5e7e7
child 39625 10c5eacd793f
equal deleted inserted replaced
33088:65cadeea6c22 33089:9e0d222f5687
    55     "bookmarks": [],
    55     "bookmarks": [],
    56     "branch": "default",
    56     "branch": "default",
    57     "dirty": "+",
    57     "dirty": "+",
    58     "id": "f25cbe84d8b3+2d95304fed5d+",
    58     "id": "f25cbe84d8b3+2d95304fed5d+",
    59     "node": "ffffffffffffffffffffffffffffffffffffffff",
    59     "node": "ffffffffffffffffffffffffffffffffffffffff",
    60     "p1": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}],
    60     "parents": [{"node": "f25cbe84d8b320e298e7703f18a25a3959518c23", "rev": 4}, {"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
    61     "p2": [{"node": "2d95304fed5d89bc9d70b2a0d02f0d567469c3ab", "rev": 2}],
       
    62     "tags": ["tip"]
    61     "tags": ["tip"]
    63    }
    62    }
    64   ]
    63   ]
    65   $ hg commit -mm1
    64   $ hg commit -mm1
    66 
    65