diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 23:00:06 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-03 23:00:06 +0200 |
| commit | ff13396926f3352d9e29c0663154918297dc5af7 (patch) | |
| tree | 71979efc1ad17ab15a365f86ecb49dd128c65772 /xdiff.h | |
| parent | 4e7e8bf9616661bec0c9b9d9c50aca03e600f32b (diff) | |
| parent | e651cb0d2dc2dbd458c51cdba8ae56e8629348cc (diff) | |
Merge branch 'jo/dirlink'
* jo/dirlink:
Rename dirlink to gitlink.
Conflicts:
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'xdiff.h')
0 files changed, 0 insertions, 0 deletions