Commit [d429ff] master History

[#2838] update merge commands to ones that work

Signed-off-by: Dave Brondsema dbrondsema@geek.net

Dave Brondsema Dave Brondsema 2011-09-20

Jenny Steele Jenny Steele 2011-09-27

Browse code at this revision

Parent(s): [8d1a82]

Child(ren): [3f9e1b][ca106a]

changed ForgeGit/forgegit/model/git_repo.py
changed ForgeHg/forgehg/model/hg.py
ForgeGit/forgegit/model/git_repo.py Diff Switch to side-by-side view
Loading...
ForgeHg/forgehg/model/hg.py Diff Switch to side-by-side view
Loading...