.hgsigs
author Patrick Mezard <pmezard@gmail.com>
Wed, 03 Oct 2007 23:09:36 +0200
changeset 5390 36c46e20976a
parent 4725 cf8b8f62688a
child 5474 5d8f5ad45c12
permissions -rw-r--r--
merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2253
ccd5f17f1eea Added signature for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0 iD8DBQBEYmO2ywK+sNU5EO8RAnaYAKCO7x15xUn5mnhqWNXqk/ehlhRt2QCfRDfY0LrUq2q4oK/KypuJYPHgq1A=
2660
ad329294d808 Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com>
parents: 2253
diff changeset
     2
2be3001847cb18a23c403439d9e7d0ace30804e9 0 iD8DBQBExUbjywK+sNU5EO8RAhzxAKCtyHAQUzcTSZTqlfJ0by6vhREwWQCghaQFHfkfN0l9/40EowNhuMOKnJk=
3867
d210a1b05cf6 Added signature for changeset 36a957364b1b89c150f2d0e60a99befe0ee08bd3
Matt Mackall <mpm@selenic.com>
parents: 2660
diff changeset
     3
36a957364b1b89c150f2d0e60a99befe0ee08bd3 0 iD8DBQBFfL2QywK+sNU5EO8RAjYFAKCoGlaWRTeMsjdmxAjUYx6diZxOBwCfY6IpBYsKvPTwB3oktnPt5Rmrlys=
3927
93e5f07baf75 Added signature for changeset 27230c29bfec36d5540fbe1c976810aefecfd1d2
Matt Mackall <mpm@selenic.com>
parents: 3867
diff changeset
     4
27230c29bfec36d5540fbe1c976810aefecfd1d2 0 iD8DBQBFheweywK+sNU5EO8RAt7VAKCrqJQWT2/uo2RWf0ZI4bLp6v82jACgjrMdsaTbxRsypcmEsdPhlG6/8F4=
4725
cf8b8f62688a Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694
Matt Mackall <mpm@selenic.com>
parents: 3927
diff changeset
     5
fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0 iD8DBQBGgHicywK+sNU5EO8RAgNxAJ0VG8ixAaeudx4sZbhngI1syu49HQCeNUJQfWBgA8bkJ2pvsFpNxwYaX3I=