Merge branch 'master' of ssh://secure.phabricator.com/diffusion/P
Description
Description
Details
Details
- Provenance
chad Authored on chad Pushed on Dec 21 2015, 5:48 PM - Differential Revision
- D14838: Correct some Pirate translations
- Parents
- rP75ba2c092647: Correct some Pirate translations
rP424cc3010345: Correct some Pirate translations - Branches
- Unknown
- Tags
- Build Status
Buildable 9691 Build 11621: Run Core Tests
Event Timeline
Comment Actions
I think this is the graph:
+--- master V o <-- This Commit |\ | \ | o <-- Actual Changes | / |/ o | o <-- Nice, Linear Master | o <-- So Nice | o <-- So Linear | ...
..so it's correct that "This Commit" only merges one change into master ("Actual Changes").
Comment Actions
That is, "merged changes" is all commits reachable from the second parent that aren't reachable from the first parent (or vice versa, I never remember which is which and Git and Mercurial use opposite orders). It's not a list of parents, that's in "Parents" up top (and does list two parents).
Comment Actions
Actual graph is clearer:
"Merged Changes" is perhaps more obvious on a real merge commit like rP7ce84cc27b81a390d4a0d0c224dbc18597d6c1cc.
Merged Changes
Merged Changes