diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-17 23:52:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-17 23:52:45 (GMT) |
| commit | e986e26a86616054f96373280e8f9cc89d7ea8ca (patch) | |
| tree | 9a7192bd9f97ee049d3c73f76385d883d2055339 /Documentation/git-merge-file.txt | |
| parent | 2eb54efc6c12cb20403db9a4739bd736c3bfaad1 (diff) | |
| parent | b9e7efb8b5f7d424466dd1ce61fd20658f60543f (diff) | |
| download | git-e986e26a86616054f96373280e8f9cc89d7ea8ca.zip git-e986e26a86616054f96373280e8f9cc89d7ea8ca.tar.gz git-e986e26a86616054f96373280e8f9cc89d7ea8ca.tar.bz2 | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Gracefully handle bad TCL_PATH at compile time
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions