diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-26 19:10:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 19:10:43 -0700 |
| commit | 2d3cfd77ad5305c132f7b23c192ae6c327443c95 (patch) | |
| tree | 1da4406a5b40b43c44e7a67a130febbd8fc11c15 /merge-tree.c | |
| parent | Makefile: fix dependency on wt-status.h (diff) | |
| parent | git-gui: Vertically align textboxes with labels (diff) | |
| download | tgif-2d3cfd77ad5305c132f7b23c192ae6c327443c95.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Vertically align textboxes with labels
git-gui: Handle workdir detection when CYGWIN=nowinsymlinks
git-gui: Add a --trace command line option
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions