diff tests/test-commit-unresolved.t @ 23405:2a038deeac9a

merge: 0 is a valid ancestor different from None Most internal functions can take either a hash or an integer. Merge did however not handle 0 as revision 0. Now it does.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 30 Nov 2014 19:26:53 +0100
parents b081decd9062
children 3cbb5bf4035d
line wrap: on
line diff