diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-06 22:11:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-06 22:11:30 -0800 |
| commit | 1fd365d5efab58453d9200d51ddf6ec700e03d8b (patch) | |
| tree | 5d50b5aefc76b34866292368b3556363e3584d05 /git-merge-resolve.sh | |
| parent | Merge branch 'jn/warn-on-inaccessible-loosen' (diff) | |
| parent | Makefile: replace "echo 1>..." with "echo >..." (diff) | |
| download | tgif-1fd365d5efab58453d9200d51ddf6ec700e03d8b.tar.xz | |
Merge branch 'cc/no-gitk-build-dependency'
Remove leftover bits from an earlier change to move gitk in its own
subdirectory. Reimplementing the dependency tracking rules needs
to be done in gitk history separately.
* cc/no-gitk-build-dependency:
Makefile: replace "echo 1>..." with "echo >..."
Makefile: detect when PYTHON_PATH changes
Makefile: remove tracking of TCLTK_PATH
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions