Mercurial > hg > easyhg
comparison mainwindow.cpp @ 281:9162f14c5ab7
* Change "diff to parent <id>" menu entries in changeset item right-button menu to "diff to left parent" and "diff to right parent"
author | Chris Cannam |
---|---|
date | Fri, 18 Feb 2011 13:38:31 +0000 |
parents | cc95394e2392 |
children | 1ec306df738e |
comparison
equal
deleted
inserted
replaced
277:b6e4643d6c05 | 281:9162f14c5ab7 |
---|---|
588 QString diff = getDiffBinaryName(); | 588 QString diff = getDiffBinaryName(); |
589 if (diff == "") return; | 589 if (diff == "") return; |
590 | 590 |
591 QStringList params; | 591 QStringList params; |
592 | 592 |
593 // Diff given revision against working folder | 593 // Diff given revision against parent revision |
594 | 594 |
595 params << "--config" << "extensions.extdiff=" << "extdiff"; | 595 params << "--config" << "extensions.extdiff=" << "extdiff"; |
596 params << "--program" << diff; | 596 params << "--program" << diff; |
597 params << "--rev" << Changeset::hashOf(parent) | 597 params << "--rev" << Changeset::hashOf(parent) |
598 << "--rev" << Changeset::hashOf(child); | 598 << "--rev" << Changeset::hashOf(child); |