diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:41 -0700 |
| commit | ea56a7ed971f3bd547abb16a3cb9a41c00133c85 (patch) | |
| tree | 774e0039fb71f74ed612014d36ddd50c6014838a /git-gui/po/glossary | |
| parent | Merge branch 'js/merge-rr-fix' (diff) | |
| parent | merge-tree: fix where two branches share no changes (diff) | |
| download | tgif-ea56a7ed971f3bd547abb16a3cb9a41c00133c85.tar.xz | |
Merge branch 'wp/merge-tree-fix'
* wp/merge-tree-fix:
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
Diffstat (limited to 'git-gui/po/glossary')
0 files changed, 0 insertions, 0 deletions