Carlos Martín Nieto a1bbc0ce20 merge: rename _oid() -> id() ... Following the rest of the series, use 'id' when refering to the value.		2014-01-25 08:15:44 +01:00
..
trees	index: rename an entry's id to 'id'	2014-01-25 08:15:44 +01:00
workdir	merge: rename _oid() -> id()	2014-01-25 08:15:44 +01:00
merge_helpers.c	index: rename an entry's id to 'id'	2014-01-25 08:15:44 +01:00
merge_helpers.h	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00