diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:30 -0700 |
| commit | c67e367c50304c5a0701ae2bb8ecb7291f481ffd (patch) | |
| tree | 6c4015ddf403faec0ed182c39341cb42e670f878 /Documentation/git-merge.txt | |
| parent | Merge branch 'mz/maint-rename-unmerged' (diff) | |
| parent | Kill off get_relative_cwd() (diff) | |
| download | tgif-c67e367c50304c5a0701ae2bb8ecb7291f481ffd.tar.xz | |
Merge branch 'nd/maint-setup'
* nd/maint-setup:
Kill off get_relative_cwd()
setup: return correct prefix if worktree is '/'
Conflicts:
dir.c
setup.c
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions